The branch master has been updated
via 8e237299b0357091dae8e7175cbfa11f4fbc98c7 (commit)
from ee84152fae23f962c5f81ca45ca27a271c989152 (commit)
- Log -----------------------------------------------------------------
commit 8e237299b0357091dae8e7175cbfa11f4fbc98c7
Author: Dr. Stephen Henson <st...@openssl.org>
Date: Sat Jan 16 16:11:34 2016 +0000
fix no-engine build
Reviewed-by: Rich Salz <rs...@openssl.org>
Reviewed-by: Richard Levitte <levi...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/ts.h | 2 ++
util/libeay.num | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 1c54b4d..e232e62 100644
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -557,9 +557,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 8587169..acfa34d 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3847,7 +3847,7 @@ b2i_PVK_bio 4250 1_1_0
EXIST::FUNCTION:RC4
ASN1_UTCTIME_adj 4251 1_1_0 EXIST::FUNCTION:
TS_TST_INFO_new 4252 1_1_0 EXIST::FUNCTION:
EVP_MD_do_all_sorted 4253 1_1_0 EXIST::FUNCTION:
-TS_CONF_set_default_engine 4254 1_1_0 EXIST::FUNCTION:
+TS_CONF_set_default_engine 4254 1_1_0 EXIST::FUNCTION:ENGINE
TS_ACCURACY_set_seconds 4255 1_1_0 EXIST::FUNCTION:
TS_TST_INFO_get_time 4256 1_1_0 EXIST::FUNCTION:
PKCS8_pkey_get0 4257 1_1_0 EXIST::FUNCTION:
@@ -4071,7 +4071,7 @@ EVP_PKEY_meth_find 4469 1_1_0
EXIST::FUNCTION:
EVP_PKEY_id 4470 1_1_0 EXIST::FUNCTION:
TS_TST_INFO_set_serial 4471 1_1_0 EXIST::FUNCTION:
a2i_GENERAL_NAME 4472 1_1_0 EXIST::FUNCTION:
-TS_CONF_set_crypto_device 4473 1_1_0 EXIST::FUNCTION:
+TS_CONF_set_crypto_device 4473 1_1_0 EXIST::FUNCTION:ENGINE
EVP_PKEY_verify_init 4474 1_1_0 EXIST::FUNCTION:
TS_CONF_set_policies 4475 1_1_0 EXIST::FUNCTION:
ASN1_PCTX_new 4476 1_1_0 EXIST::FUNCTION:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
