Commit b30d184a 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 aa4c32eb

crypto/evp/evp_err.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -72,6 +72,7 @@ static ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_FUNC(EVP_F_EVP_PKEY_NEW), "EVP_PKEY_new"},

    {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN), "EVP_PKEY_paramgen"},

    {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN_INIT), "EVP_PKEY_paramgen_init"},

    {ERR_FUNC(EVP_F_EVP_PKEY_SET1_ENGINE), "EVP_PKEY_set1_engine"},

    {ERR_FUNC(EVP_F_EVP_PKEY_SIGN), "EVP_PKEY_sign"},

    {ERR_FUNC(EVP_F_EVP_PKEY_SIGN_INIT), "EVP_PKEY_sign_init"},

    {ERR_FUNC(EVP_F_EVP_PKEY_VERIFY), "EVP_PKEY_verify"},

include/openssl/evp.h

+1 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,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
@@ -4231,3 +4231,4 @@ UINT32_it 4214 1_1_0f EXIST:EXPORT_VAR_AS_FUNCTION 
ZINT64_it                               4215	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZINT64_it                               4215	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

CRYPTO_secure_clear_free                4315	1_1_0g	EXIST::FUNCTION:

EVP_PKEY_set1_engine                    4347	1_1_0g	EXIST::FUNCTION:ENGINE