diff options
author | jkim <jkim@FreeBSD.org> | 2015-01-09 00:58:20 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-01-09 00:58:20 +0000 |
commit | 27e2f26e1531b869ff531fab5ac3ef06aae4d4f4 (patch) | |
tree | 11138272980644b3ccdbfe7c0ebead1536be5efb /crypto/openssl/crypto/dsa | |
parent | 3e6f1de34088867465b6a1a87fb10c25fc811e50 (diff) | |
download | FreeBSD-src-27e2f26e1531b869ff531fab5ac3ef06aae4d4f4.zip FreeBSD-src-27e2f26e1531b869ff531fab5ac3ef06aae4d4f4.tar.gz |
MFC: r276861, r276863
Merge OpenSSL 1.0.1k.
Diffstat (limited to 'crypto/openssl/crypto/dsa')
-rw-r--r-- | crypto/openssl/crypto/dsa/dsa_asn1.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/dsa/dsa_asn1.c b/crypto/openssl/crypto/dsa/dsa_asn1.c index 6058534..473af87 100644 --- a/crypto/openssl/crypto/dsa/dsa_asn1.c +++ b/crypto/openssl/crypto/dsa/dsa_asn1.c @@ -176,13 +176,25 @@ int DSA_verify(int type, const unsigned char *dgst, int dgst_len, const unsigned char *sigbuf, int siglen, DSA *dsa) { DSA_SIG *s; + const unsigned char *p = sigbuf; + unsigned char *der = NULL; + int derlen = -1; int ret=-1; s = DSA_SIG_new(); if (s == NULL) return(ret); - if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err; + if (d2i_DSA_SIG(&s,&p,siglen) == NULL) goto err; + /* Ensure signature uses DER and doesn't have trailing garbage */ + derlen = i2d_DSA_SIG(s, &der); + if (derlen != siglen || memcmp(sigbuf, der, derlen)) + goto err; ret=DSA_do_verify(dgst,dgst_len,s,dsa); err: + if (derlen > 0) + { + OPENSSL_cleanse(der, derlen); + OPENSSL_free(der); + } DSA_SIG_free(s); return(ret); } |