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

Remove non-functional part of recent patch, after discussion with 

Colin Percival (this would have caused more problems than solved,
and isn't really necessary anyway)
parent 613e7d2a

crypto/rsa/rsa.h

+0 −1
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ void ERR_load_RSA_strings(void); 
#define RSA_R_N_DOES_NOT_EQUAL_P_Q			 127

#define RSA_R_OAEP_DECODING_ERROR			 121

#define RSA_R_PADDING_CHECK_FAILED			 114

#define RSA_R_PKCS1_PADDING_TOO_SHORT			 105

#define RSA_R_P_NOT_PRIME				 128

#define RSA_R_Q_NOT_PRIME				 129

#define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED		 130

crypto/rsa/rsa_eay.c

+0 −9
Original line number Diff line number Diff line
@@ -640,15 +640,6 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from, 
		{

	case RSA_PKCS1_PADDING:

		r=RSA_padding_check_PKCS1_type_1(to,num,buf,i,num);

		/* Generally signatures should be at least 2/3 padding, though

		   this isn't possible for really short keys and some standard

		   signature schemes, so don't check if the unpadded data is

		   small. */

		if(r > 42 && 3*8*r >= BN_num_bits(rsa->n))

			{

			RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT, RSA_R_PKCS1_PADDING_TOO_SHORT);

			goto err;

			}

		break;

	case RSA_X931_PADDING:

		r=RSA_padding_check_X931(to,num,buf,i,num);

crypto/rsa/rsa_err.c

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static ERR_STRING_DATA RSA_str_reasons[]= 
{ERR_REASON(RSA_R_N_DOES_NOT_EQUAL_P_Q)  ,"n does not equal p q"},

{ERR_REASON(RSA_R_OAEP_DECODING_ERROR)   ,"oaep decoding error"},

{ERR_REASON(RSA_R_PADDING_CHECK_FAILED)  ,"padding check failed"},

{ERR_REASON(RSA_R_PKCS1_PADDING_TOO_SHORT),"pkcs1 padding too short"},

{ERR_REASON(RSA_R_P_NOT_PRIME)           ,"p not prime"},

{ERR_REASON(RSA_R_Q_NOT_PRIME)           ,"q not prime"},

{ERR_REASON(RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),"rsa operations not supported"},