Commit 2d3855fc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2127 

Submitted by: Tomas Mraz <tmraz@redhat.com>

Check for lookup failures in EVP_PBE_CipherInit().
parent 1cd47f5f

crypto/evp/evp.h

+2 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,8 @@ void ERR_load_EVP_strings(void); 
#define EVP_R_PRIVATE_KEY_DECODE_ERROR			 145

#define EVP_R_PRIVATE_KEY_ENCODE_ERROR			 146

#define EVP_R_PUBLIC_KEY_NOT_RSA			 106

#define EVP_R_UNKNOWN_CIPHER				 160

#define EVP_R_UNKNOWN_DIGEST				 161

#define EVP_R_UNKNOWN_PBE_ALGORITHM			 121

#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS		 135

#define EVP_R_UNSUPPORTED_ALGORITHM			 156

crypto/evp/evp_err.c

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static ERR_STRING_DATA EVP_str_reasons[]= 
{ERR_REASON(EVP_R_PRIVATE_KEY_DECODE_ERROR),"private key decode error"},

{ERR_REASON(EVP_R_PRIVATE_KEY_ENCODE_ERROR),"private key encode error"},

{ERR_REASON(EVP_R_PUBLIC_KEY_NOT_RSA)    ,"public key not rsa"},

{ERR_REASON(EVP_R_UNKNOWN_CIPHER)        ,"unknown cipher"},

{ERR_REASON(EVP_R_UNKNOWN_DIGEST)        ,"unknown digest"},

{ERR_REASON(EVP_R_UNKNOWN_PBE_ALGORITHM) ,"unknown pbe algorithm"},

{ERR_REASON(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS),"unsuported number of rounds"},

{ERR_REASON(EVP_R_UNSUPPORTED_ALGORITHM) ,"unsupported algorithm"},

crypto/evp/evp_pbe.c

+14 −0
Original line number Diff line number Diff line
@@ -174,12 +174,26 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, 
	if (cipher_nid == -1)

		cipher = NULL;

	else

		{

		cipher = EVP_get_cipherbynid(cipher_nid);

		if (!cipher)

			{

			EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_CIPHER);

			return 0;

			}

		}



	if (md_nid == -1)

		md = NULL;

	else

		{

		md = EVP_get_digestbynid(md_nid);

		if (!md)

			{

			EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_DIGEST);

			return 0;

			}

		}



	if (!keygen(ctx, pass, passlen, param, cipher, md, en_de))

		{