diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2015-12-03 23:03:11 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2015-12-03 23:03:11 +0000 |
| commit | dacaaf6c723a2b6c7a8e2ab9917aab5aa11eacae (patch) | |
| tree | 69e6262ff2f2b649625e8a53694f3f61ba8ff2f0 | |
| parent | a7b84228613ba71b40c31dd804dc798db9ef24ad (diff) | |
Fix for OpenSSL CVE-2015-3194
ok krw@
| -rw-r--r-- | lib/libssl/src/crypto/rsa/rsa_ameth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/rsa/rsa_ameth.c b/lib/libssl/src/crypto/rsa/rsa_ameth.c index 528b72b4b90..b66c7492939 100644 --- a/lib/libssl/src/crypto/rsa/rsa_ameth.c +++ b/lib/libssl/src/crypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.14 2015/02/11 04:05:14 beck Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.15 2015/12/03 23:03:10 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -298,7 +298,7 @@ rsa_pss_decode(const X509_ALGOR *alg, X509_ALGOR **pmaskHash) if (pss->maskGenAlgorithm) { ASN1_TYPE *param = pss->maskGenAlgorithm->parameter; if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1 && - param->type == V_ASN1_SEQUENCE) { + param && param->type == V_ASN1_SEQUENCE) { p = param->value.sequence->data; plen = param->value.sequence->length; *pmaskHash = d2i_X509_ALGOR(NULL, &p, plen); |