From 08b250d56592b8e385cfc37c2d938b839653c264 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 16 Jan 2016 16:11:34 +0000 Subject: [PATCH] fix no-engine build Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- crypto/ts/ts.h | 2 ++ util/libeay.num | 4 ++-- util/mk1mf.pl | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h index 2daa1b2fb..fc8c14b2d 100644 --- a/crypto/ts/ts.h +++ b/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 a/util/libeay.num b/util/libeay.num index 2094ab364..23ade08e2 100755 --- a/util/libeay.num +++ b/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 a/util/mk1mf.pl b/util/mk1mf.pl index 7a3ae11f7..6ada6fa62 100755 --- a/util/mk1mf.pl +++ b/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.11.0