Commit 5c95c2ac authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix various error codes to match functions.

parent 454dbbc5

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_LONG_C2I					 166

#define ASN1_F_OID_MODULE_INIT				 174

#define ASN1_F_PARSE_TAGGING				 182

#define ASN1_F_PKCS5_PBE2_SET				 167

#define ASN1_F_PKCS5_PBE2_SET_IV			 167

#define ASN1_F_PKCS5_PBE_SET				 202

#define ASN1_F_X509_CINF_NEW				 168

#define ASN1_F_X509_CRL_ADD0_REVOKED			 169

crypto/asn1/asn1_err.c

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_LONG_C2I),	"LONG_C2I"},

{ERR_FUNC(ASN1_F_OID_MODULE_INIT),	"OID_MODULE_INIT"},

{ERR_FUNC(ASN1_F_PARSE_TAGGING),	"PARSE_TAGGING"},

{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET),	"PKCS5_pbe2_set"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),	"PKCS5_PBE_SET"},

{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV),	"PKCS5_pbe2_set_iv"},

{ERR_FUNC(ASN1_F_X509_CINF_NEW),	"X509_CINF_NEW"},

{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),	"X509_CRL_ADD0_REVOKED"},

{ERR_FUNC(ASN1_F_X509_INFO_NEW),	"X509_INFO_NEW"},

crypto/asn1/p5_pbev2.c

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, 


	alg_nid = EVP_CIPHER_type(cipher);

	if(alg_nid == NID_undef) {

		ASN1err(ASN1_F_PKCS5_PBE2_SET,

		ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,

				ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);

		goto err;

	}
@@ -129,7 +129,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, 
	/* Dummy cipherinit to just setup the IV, and PRF */

	EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0);

	if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) {

		ASN1err(ASN1_F_PKCS5_PBE2_SET,

		ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,

					ASN1_R_ERROR_SETTING_CIPHER_PARAMS);

		EVP_CIPHER_CTX_cleanup(&ctx);

		goto err;
@@ -214,7 +214,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, 
	return ret;



	merr:

	ASN1err(ASN1_F_PKCS5_PBE2_SET,ERR_R_MALLOC_FAILURE);

	ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,ERR_R_MALLOC_FAILURE);



	err:

	PBE2PARAM_free(pbe2);

crypto/dh/dh.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void ERR_load_DH_strings(void); 


/* Function codes. */

#define DH_F_COMPUTE_KEY				 102

#define DH_F_DHPARAMS_PRINT				 100

#define DH_F_DO_DH_PRINT				 100

#define DH_F_DHPARAMS_PRINT_FP				 101

#define DH_F_DH_BUILTIN_GENPARAMS			 106

#define DH_F_DH_NEW_METHOD				 105

crypto/dh/dh_ameth.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, 
	if (0)

		{

err:

		DHerr(DH_F_DHPARAMS_PRINT,reason);

		DHerr(DH_F_DO_DH_PRINT,reason);

		}

	if (m != NULL) OPENSSL_free(m);

	return(ret);