diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:31:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:33:30 +0200 |
| commit | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch) | |
| tree | 6a0005fed0f248559139016a7310add07fcb62df /openssl/crypto/rsa/rsa_sign.c | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2 vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip | |
Update to openssl-1.0.1j
Diffstat (limited to 'openssl/crypto/rsa/rsa_sign.c')
| -rw-r--r-- | openssl/crypto/rsa/rsa_sign.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/openssl/crypto/rsa/rsa_sign.c b/openssl/crypto/rsa/rsa_sign.c index b6f6037ae..225bcfe2d 100644 --- a/openssl/crypto/rsa/rsa_sign.c +++ b/openssl/crypto/rsa/rsa_sign.c @@ -151,6 +151,25 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len, return(ret); } +/* + * Check DigestInfo structure does not contain extraneous data by reencoding + * using DER and checking encoding against original. + */ +static int rsa_check_digestinfo(X509_SIG *sig, const unsigned char *dinfo, int dinfolen) + { + unsigned char *der = NULL; + int derlen; + int ret = 0; + derlen = i2d_X509_SIG(sig, &der); + if (derlen <= 0) + return 0; + if (derlen == dinfolen && !memcmp(dinfo, der, derlen)) + ret = 1; + OPENSSL_cleanse(der, derlen); + OPENSSL_free(der); + return ret; + } + int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, unsigned char *rm, size_t *prm_len, @@ -228,7 +247,7 @@ int int_rsa_verify(int dtype, const unsigned char *m, if (sig == NULL) goto err; /* Excess data can be used to create forgeries */ - if(p != s+i) + if(p != s+i || !rsa_check_digestinfo(sig, s, i)) { RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE); goto err; |