diff options
| author |   beck <beck@openbsd.org> | 2015-12-03 23:03:10 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2015-12-03 23:03:10 +0000 |
| commit | b97954594ed49e94c660cabd50519c08cb856eef (patch) | |
| tree | a215199c3cf2df86ffa4101e6a726a29be2ba27b | |
| parent | enter new dir (diff) | |
| download | wireguard-openbsd-b97954594ed49e94c660cabd50519c08cb856eef.tar.xz wireguard-openbsd-b97954594ed49e94c660cabd50519c08cb856eef.zip | |
Fix for OpenSSL CVE-2015-3194
ok krw@
| -rw-r--r-- | lib/libcrypto/rsa/rsa_ameth.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/rsa/rsa_ameth.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/rsa/rsa_ameth.c b/lib/libcrypto/rsa/rsa_ameth.c index 528b72b4b90..b66c7492939 100644 --- a/lib/libcrypto/rsa/rsa_ameth.c +++ b/lib/libcrypto/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); 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); |