diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2005-06-06 22:41:50 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2005-06-06 22:41:50 +0000 |
| commit | 39d29195a7c6fe7394137ea543d19edd28465de9 (patch) | |
| tree | 9cfa0d52cc3701f34215589e5aeacbad224ef6cd | |
| parent | 727c9b80278005e16b448ab505bccf16e73784b3 (diff) | |
| download | openssl-new-39d29195a7c6fe7394137ea543d19edd28465de9.tar.gz | |
Update from head.
| -rw-r--r-- | crypto/rsa/rsa_x931.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/crypto/rsa/rsa_x931.c b/crypto/rsa/rsa_x931.c index 7d77213d13..e918654176 100644 --- a/crypto/rsa/rsa_x931.c +++ b/crypto/rsa/rsa_x931.c @@ -115,9 +115,9 @@ int RSA_padding_check_X931(unsigned char *to, int tlen, return -1; } - j=flen-3; if (*p++ == 0x6B) { + j=flen-3; for (i = 0; i < j; i++) { unsigned char c = *p++; @@ -130,15 +130,17 @@ int RSA_padding_check_X931(unsigned char *to, int tlen, return -1; } } - } - j -= i; + j -= i; + + if (i == 0) + { + RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_PADDING); + return -1; + } - if (i == 0) - { - RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_PADDING); - return -1; } + else j = flen - 2; if (p[j] != 0xCC) { |