76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
From aeae7469061c1675d651224789fc664d6809b0d9 Mon Sep 17 00:00:00 2001
|
|
From: "Dr. Stephen Henson" <steve@openssl.org>
|
|
Date: Sat, 16 Jan 2016 16:11:34 +0000
|
|
Subject: [PATCH] fix no-engine build
|
|
|
|
Reviewed-by: Rich Salz <rsalz@openssl.org>
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
---
|
|
crypto/ts/ts.h | 2 ++
|
|
util/libeay.num | 4 ++--
|
|
util/mk1mf.pl | 3 +--
|
|
3 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git x/crypto/ts/ts.h y/crypto/ts/ts.h
|
|
index 2daa1b2fb5..fc8c14b2d0 100644
|
|
--- x/crypto/ts/ts.h
|
|
+++ y/crypto/ts/ts.h
|
|
@@ -737,9 +737,11 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
|
|
const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
|
|
int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
|
|
TS_RESP_CTX *ctx);
|
|
+#ifndef OPENSSL_NO_ENGINE
|
|
int TS_CONF_set_crypto_device(CONF *conf, const char *section,
|
|
const char *device);
|
|
int TS_CONF_set_default_engine(const char *name);
|
|
+#endif
|
|
int TS_CONF_set_signer_cert(CONF *conf, const char *section,
|
|
const char *cert, TS_RESP_CTX *ctx);
|
|
int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
|
|
diff --git x/util/libeay.num y/util/libeay.num
|
|
index fddfe1cbb2..a76424ceab 100755
|
|
--- x/util/libeay.num
|
|
+++ y/util/libeay.num
|
|
@@ -3874,7 +3874,7 @@ b2i_PVK_bio 4250 EXIST::FUNCTION:RC4
|
|
ASN1_UTCTIME_adj 4251 EXIST::FUNCTION:
|
|
TS_TST_INFO_new 4252 EXIST::FUNCTION:
|
|
EVP_MD_do_all_sorted 4253 EXIST::FUNCTION:
|
|
-TS_CONF_set_default_engine 4254 EXIST::FUNCTION:
|
|
+TS_CONF_set_default_engine 4254 EXIST::FUNCTION:ENGINE
|
|
TS_ACCURACY_set_seconds 4255 EXIST::FUNCTION:
|
|
TS_TST_INFO_get_time 4256 EXIST::FUNCTION:
|
|
PKCS8_pkey_get0 4257 EXIST::FUNCTION:
|
|
@@ -4099,7 +4099,7 @@ EVP_PKEY_meth_find 4469 EXIST::FUNCTION:
|
|
EVP_PKEY_id 4470 EXIST::FUNCTION:
|
|
TS_TST_INFO_set_serial 4471 EXIST::FUNCTION:
|
|
a2i_GENERAL_NAME 4472 EXIST::FUNCTION:
|
|
-TS_CONF_set_crypto_device 4473 EXIST::FUNCTION:
|
|
+TS_CONF_set_crypto_device 4473 EXIST::FUNCTION:ENGINE
|
|
EVP_PKEY_verify_init 4474 EXIST::FUNCTION:
|
|
TS_CONF_set_policies 4475 EXIST::FUNCTION:
|
|
ASN1_PCTX_new 4476 EXIST::FUNCTION:
|
|
diff --git x/util/mk1mf.pl y/util/mk1mf.pl
|
|
index 6b31496ed1..ccfb24ca55 100755
|
|
--- x/util/mk1mf.pl
|
|
+++ y/util/mk1mf.pl
|
|
@@ -428,7 +428,6 @@ EOF
|
|
{
|
|
$extra_install .= <<"EOF"
|
|
\$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
|
|
- \$(CP) \$(E_SHLIB) \"\$(INSTALLTOP)${o}lib${o}engines\"
|
|
EOF
|
|
}
|
|
}
|
|
@@ -597,7 +596,7 @@ init: \$(TMP_D) \$(LIB_D) \$(INC_D) \$(INCO_D) \$(BIN_D) \$(TEST_D) headers
|
|
|
|
headers: \$(HEADER) \$(EXHEADER)
|
|
|
|
-lib: \$(LIBS_DEP) \$(E_SHLIB)
|
|
+lib: \$(LIBS_DEP)
|
|
|
|
exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
|
|
|
|
--
|
|
2.15.0
|
|
|