Commit 79204b9c authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4596)
parent d85722d3

crypto/err/openssl.txt

+3 −0
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ EVP_F_EVP_PBE_CIPHERINIT:116:EVP_PBE_CipherInit 
EVP_F_EVP_PBE_SCRYPT:181:EVP_PBE_scrypt

EVP_F_EVP_PKCS82PKEY:111:EVP_PKCS82PKEY

EVP_F_EVP_PKEY2PKCS8:113:EVP_PKEY2PKCS8

EVP_F_EVP_PKEY_ASN1_ADD0:188:EVP_PKEY_asn1_add0

EVP_F_EVP_PKEY_CHECK:186:EVP_PKEY_check

EVP_F_EVP_PKEY_COPY_PARAMETERS:103:EVP_PKEY_copy_parameters

EVP_F_EVP_PKEY_CTX_CTRL:137:EVP_PKEY_CTX_ctrl
@@ -1970,6 +1971,8 @@ EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE:150:\ 
	operation not supported for this keytype

EVP_R_OPERATON_NOT_INITIALIZED:151:operaton not initialized

EVP_R_PARTIALLY_OVERLAPPING:162:partially overlapping buffers

EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED:179:\

	pkey asn1 method already registered

EVP_R_PRIVATE_KEY_DECODE_ERROR:145:private key decode error

EVP_R_PRIVATE_KEY_ENCODE_ERROR:146:private key encode error

EVP_R_PUBLIC_KEY_NOT_RSA:106:public key not rsa

crypto/evp/evp_err.c

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PBE_SCRYPT, 0), "EVP_PBE_scrypt"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKCS82PKEY, 0), "EVP_PKCS82PKEY"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY2PKCS8, 0), "EVP_PKEY2PKCS8"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_ASN1_ADD0, 0), "EVP_PKEY_asn1_add0"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_CHECK, 0), "EVP_PKEY_check"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_COPY_PARAMETERS, 0),

     "EVP_PKEY_copy_parameters"},
@@ -200,6 +201,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = { 
    "operaton not initialized"},

    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),

    "partially overlapping buffers"},

    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED),

    "pkey asn1 method already registered"},

    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_DECODE_ERROR),

    "private key decode error"},

    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_ENCODE_ERROR),

include/openssl/evperr.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ int ERR_load_EVP_strings(void); 
# define EVP_F_EVP_PBE_SCRYPT                             181

# define EVP_F_EVP_PKCS82PKEY                             111

# define EVP_F_EVP_PKEY2PKCS8                             113

# define EVP_F_EVP_PKEY_ASN1_ADD0                         188

# define EVP_F_EVP_PKEY_CHECK                             186

# define EVP_F_EVP_PKEY_COPY_PARAMETERS                   103

# define EVP_F_EVP_PKEY_CTX_CTRL                          137
@@ -151,6 +152,7 @@ int ERR_load_EVP_strings(void); 
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150

# define EVP_R_OPERATON_NOT_INITIALIZED                   151

# define EVP_R_PARTIALLY_OVERLAPPING                      162

# define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED        179

# define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145

# define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146

# define EVP_R_PUBLIC_KEY_NOT_RSA                         106