diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-09-06 06:43:11 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-09-06 06:43:11 +0000 |
| commit | 2952886010a59f92a22f933cb81ee7735e008fef (patch) | |
| tree | 67341dfa602e619b282bd64b31a63f559a12357c /crypto | |
| parent | 613e7d2a6534776667353eb7ac348bdcaa403292 (diff) | |
| download | openssl-2952886010a59f92a22f933cb81ee7735e008fef.tar.gz | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rsa/rsa.h | 1 | ||||
| -rw-r--r-- | crypto/rsa/rsa_eay.c | 9 | ||||
| -rw-r--r-- | crypto/rsa/rsa_err.c | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index c8b6a814a0..31f3792a4c 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -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 diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index 863a45a975..c6ceaee6e7 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -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); diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c index 1a7f8b7719..163b143a73 100644 --- a/crypto/rsa/rsa_err.c +++ b/crypto/rsa/rsa_err.c @@ -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"}, |