Commit 4742bc0f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix remaining error code discrepancies.

parent 02e483d2

crypto/err/err_str.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1]; 
 * others will be displayed numerically by ERR_error_string.

 * It is crucial that we have something for each reason code

 * that occurs in ERR_str_reasons, or bogus reason strings

 * will be returned for SYSerr(), which always gets an errno

 * will be returned for SYSerr, which always gets an errno

 * value and never one of those 'standard' reason codes. */



static void build_SYS_str_reasons(void)

crypto/evp/dig_eng.c

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int do_evp_md_engine_full(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE * 
			{

			if (!ENGINE_init(impl))

				{

				EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERROR);

				EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);

				return 0;

				}

			}
@@ -149,7 +149,7 @@ static int do_evp_md_engine_full(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE * 
			if(!d)

				{

				/* Same comment from evp_enc.c */

				EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERROR);

				EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);

				return 0;

				}

			/* We'll use the ENGINE's private digest definition */
@@ -165,7 +165,7 @@ static int do_evp_md_engine_full(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE * 
	else

	if(!ctx->digest)

		{

		EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_NO_DIGEST_SET);

		EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_NO_DIGEST_SET);

		return 0;

		}

	return 1;

crypto/evp/digest.c

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int do_evp_md_engine(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE *impl) 
			{

			if (!ENGINE_init(impl))

				{

				EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERROR);

				EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERROR);

				return 0;

				}

			}
@@ -236,7 +236,7 @@ static int do_evp_md_engine(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE *impl) 
			if(!d)

				{

				/* Same comment from evp_enc.c */

				EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_INITIALIZATION_ERROR);

				EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_INITIALIZATION_ERROR);

				return 0;

				}

			/* We'll use the ENGINE's private digest definition */
@@ -252,7 +252,7 @@ static int do_evp_md_engine(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE *impl) 
	else

	if(!ctx->digest)

		{

		EVPerr(EVP_F_EVP_DIGESTINIT_EX,EVP_R_NO_DIGEST_SET);

		EVPerr(EVP_F_DO_EVP_MD_ENGINE,EVP_R_NO_DIGEST_SET);

		return 0;

		}

	return 1;
@@ -284,7 +284,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) 
			if (!(type->flags & EVP_MD_FLAG_FIPS) 

			 && !(ctx->flags & EVP_MD_CTX_FLAG_NON_FIPS_ALLOW))

				{

				EVPerr(EVP_F_EVP_DIGESTINIT, EVP_R_DISABLED_FOR_FIPS);

				EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_DISABLED_FOR_FIPS);

				ctx->digest = &bad_md;

				return 0;

				}

crypto/evp/enc_min.c

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int do_evp_enc_engine(EVP_CIPHER_CTX *ctx, const EVP_CIPHER **pcipher, EN 
		{

		if (!ENGINE_init(impl))

			{

			EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_INITIALIZATION_ERROR);

			EVPerr(EVP_F_DO_EVP_ENC_ENGINE, EVP_R_INITIALIZATION_ERROR);

			return 0;

			}

		}
@@ -169,7 +169,7 @@ static int do_evp_enc_engine(EVP_CIPHER_CTX *ctx, const EVP_CIPHER **pcipher, EN 
			 * control history, is that we should at least

			 * be able to avoid using US mispellings of

			 * "initialisation"? */

			EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_INITIALIZATION_ERROR);

			EVPerr(EVP_F_DO_EVP_ENC_ENGINE, EVP_R_INITIALIZATION_ERROR);

			return 0;

			}

		/* We'll use the ENGINE's private cipher definition */
@@ -295,7 +295,7 @@ skip_to_init: 
		if (!(ctx->cipher->flags & EVP_CIPH_FLAG_FIPS)

			& !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW))

			{

			EVPerr(EVP_F_EVP_CIPHERINIT, EVP_R_DISABLED_FOR_FIPS);

			EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_DISABLED_FOR_FIPS);

#if 0

			ERR_add_error_data(2, "cipher=",

						EVP_CIPHER_name(ctx->cipher));

crypto/evp/evp.h

+5 −1
Original line number Diff line number Diff line
@@ -956,6 +956,10 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_ALG_MODULE_INIT				 138

#define EVP_F_CAMELLIA_INIT_KEY				 159

#define EVP_F_D2I_PKEY					 100

#define EVP_F_DO_EVP_ENC_ENGINE				 140

#define EVP_F_DO_EVP_ENC_ENGINE_FULL			 141

#define EVP_F_DO_EVP_MD_ENGINE				 139

#define EVP_F_DO_EVP_MD_ENGINE_FULL			 142

#define EVP_F_DSAPKEY2PKCS8				 134

#define EVP_F_DSA_PKEY2PKCS8				 135

#define EVP_F_ECDSA_PKEY2PKCS8				 129
@@ -1032,6 +1036,7 @@ void ERR_load_EVP_strings(void); 
#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED		 105

#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE			 117

#define EVP_R_PUBLIC_KEY_NOT_RSA			 106

#define EVP_R_SEED_KEY_SETUP_FAILED			 162

#define EVP_R_UNKNOWN_OPTION				 149

#define EVP_R_UNKNOWN_PBE_ALGORITHM			 121

#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS		 135
@@ -1044,7 +1049,6 @@ void ERR_load_EVP_strings(void); 
#define EVP_R_UNSUPPORTED_SALT_TYPE			 126

#define EVP_R_WRONG_FINAL_BLOCK_LENGTH			 109

#define EVP_R_WRONG_PUBLIC_KEY_TYPE			 110

#define EVP_R_SEED_KEY_SETUP_FAILED			 162



#ifdef  __cplusplus

}