From 3f8b368a270c928e92c6b06cbe8002c343aedfcf Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 10 Oct 2017 13:31:04 +0100 Subject: [PATCH] make update Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/4503) --- crypto/err/openssl.txt | 1 + crypto/evp/evp_err.c | 2 ++ include/openssl/evperr.h | 1 + util/libcrypto.num | 1 + 4 files changed, 5 insertions(+) diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 58b901965b..f711dacc20 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -689,6 +689,7 @@ EVP_F_EVP_PKEY_KEYGEN_INIT:147:EVP_PKEY_keygen_init EVP_F_EVP_PKEY_NEW:106:EVP_PKEY_new EVP_F_EVP_PKEY_PARAMGEN:148:EVP_PKEY_paramgen EVP_F_EVP_PKEY_PARAMGEN_INIT:149:EVP_PKEY_paramgen_init +EVP_F_EVP_PKEY_SET1_ENGINE:187:EVP_PKEY_set1_engine EVP_F_EVP_PKEY_SIGN:140:EVP_PKEY_sign EVP_F_EVP_PKEY_SIGN_INIT:141:EVP_PKEY_sign_init EVP_F_EVP_PKEY_VERIFY:142:EVP_PKEY_verify diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index cc32a3bfde..bb3abe3e70 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -95,6 +95,8 @@ static const ERR_STRING_DATA EVP_str_functs[] = { {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_PARAMGEN, 0), "EVP_PKEY_paramgen"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_PARAMGEN_INIT, 0), "EVP_PKEY_paramgen_init"}, + {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_SET1_ENGINE, 0), + "EVP_PKEY_set1_engine"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_SIGN, 0), "EVP_PKEY_sign"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_SIGN_INIT, 0), "EVP_PKEY_sign_init"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_VERIFY, 0), "EVP_PKEY_verify"}, diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 9bb2bca323..222ba3f35a 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -82,6 +82,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_PKEY_NEW 106 # define EVP_F_EVP_PKEY_PARAMGEN 148 # define EVP_F_EVP_PKEY_PARAMGEN_INIT 149 +# define EVP_F_EVP_PKEY_SET1_ENGINE 187 # define EVP_F_EVP_PKEY_SIGN 140 # define EVP_F_EVP_PKEY_SIGN_INIT 141 # define EVP_F_EVP_PKEY_VERIFY 142 diff --git a/util/libcrypto.num b/util/libcrypto.num index 5343aeddb7..548716d1a2 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4400,3 +4400,4 @@ EVP_PKEY_meth_remove 4343 1_1_1 EXIST::FUNCTION: OPENSSL_sk_reserve 4344 1_1_1 EXIST::FUNCTION: CRYPTO_atomic_read 4345 1_1_1 EXIST::FUNCTION: CRYPTO_atomic_write 4346 1_1_1 EXIST::FUNCTION: +EVP_PKEY_set1_engine 4347 1_1_0g EXIST::FUNCTION:ENGINE