Commit 2440d8b1 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix error codes.

parent ee988465

crypto/asn1/asn1.h

+1 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_PACK_STRING				 124

#define ASN1_F_ASN1_PCTX_NEW				 205

#define ASN1_F_ASN1_PKCS5_PBE_SET			 125

#define ASN1_F_ASN1_SCTX_NEW				 221

#define ASN1_F_ASN1_SEQ_PACK				 126

#define ASN1_F_ASN1_SEQ_UNPACK				 127

#define ASN1_F_ASN1_SIGN				 128

crypto/asn1/asn1_err.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_ASN1_PACK_STRING),	"ASN1_pack_string"},

{ERR_FUNC(ASN1_F_ASN1_PCTX_NEW),	"ASN1_PCTX_new"},

{ERR_FUNC(ASN1_F_ASN1_PKCS5_PBE_SET),	"ASN1_PKCS5_PBE_SET"},

{ERR_FUNC(ASN1_F_ASN1_SCTX_NEW),	"ASN1_SCTX_new"},

{ERR_FUNC(ASN1_F_ASN1_SEQ_PACK),	"ASN1_seq_pack"},

{ERR_FUNC(ASN1_F_ASN1_SEQ_UNPACK),	"ASN1_seq_unpack"},

{ERR_FUNC(ASN1_F_ASN1_SIGN),	"ASN1_sign"},

crypto/asn1/tasn_scn.c

+1 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb)(ASN1_SCTX *ctx)) 
	ret = OPENSSL_malloc(sizeof(ASN1_SCTX));

	if (ret == NULL)

		{

		ASN1err(ASN1_F_ASN1_PCTX_NEW, ERR_R_MALLOC_FAILURE);

		ASN1err(ASN1_F_ASN1_SCTX_NEW, ERR_R_MALLOC_FAILURE);

		return NULL;

		}

	ret->scan_cb = scan_cb;
@@ -113,5 +113,3 @@ void *ASN1_SCTX_get_app_data(ASN1_SCTX *p) 
	{

	return p->app_data;

	}

crypto/evp/evp.h

+4 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,10 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_EVP_RIJNDAEL				 126

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_FIPS_CIPHERINIT				 166

#define EVP_F_FIPS_CIPHER_CTX_CTRL			 167

#define EVP_F_FIPS_DIGESTINIT				 168

#define EVP_F_FIPS_MD_CTX_COPY				 169

#define EVP_F_INT_CTX_NEW				 157

#define EVP_F_PKCS5_PBE_KEYIVGEN			 117

#define EVP_F_PKCS5_V2_PBE_KEYIVGEN			 118

crypto/evp/evp_err.c

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_RIJNDAEL),	"EVP_RIJNDAEL"},

{ERR_FUNC(EVP_F_EVP_SIGNFINAL),	"EVP_SignFinal"},

{ERR_FUNC(EVP_F_EVP_VERIFYFINAL),	"EVP_VerifyFinal"},

{ERR_FUNC(EVP_F_FIPS_CIPHERINIT),	"FIPS_CIPHERINIT"},

{ERR_FUNC(EVP_F_FIPS_CIPHER_CTX_CTRL),	"FIPS_CIPHER_CTX_CTRL"},

{ERR_FUNC(EVP_F_FIPS_DIGESTINIT),	"FIPS_DIGESTINIT"},

{ERR_FUNC(EVP_F_FIPS_MD_CTX_COPY),	"FIPS_MD_CTX_COPY"},

{ERR_FUNC(EVP_F_INT_CTX_NEW),	"INT_CTX_NEW"},

{ERR_FUNC(EVP_F_PKCS5_PBE_KEYIVGEN),	"PKCS5_PBE_keyivgen"},

{ERR_FUNC(EVP_F_PKCS5_V2_PBE_KEYIVGEN),	"PKCS5_v2_PBE_keyivgen"},