Commit 3f8b368a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make update 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4503)
parent d19b01ad

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

crypto/evp/evp_err.c

+2 −0
Original line number Diff line number Diff line
@@ -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"},

include/openssl/evperr.h

+1 −0
Original line number Diff line number Diff line
@@ -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

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -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