summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2015-12-04 04:13:44 +0000
committerbeck <>2015-12-04 04:13:44 +0000
commit35fcfe01981108e67b17b6dec5fc26ec73cd1db4 (patch)
tree9d5dbcc965c076c8a05e67cb2558b05d40259463
parent0dc7ea7940defd19987fa5c850f3bacc6dd1c144 (diff)
downloadopenbsd-35fcfe01981108e67b17b6dec5fc26ec73cd1db4.tar.gz
openbsd-35fcfe01981108e67b17b6dec5fc26ec73cd1db4.tar.bz2
openbsd-35fcfe01981108e67b17b6dec5fc26ec73cd1db4.zip
patch for OpenSSL CVE-2015-3194
-rw-r--r--src/lib/libssl/src/crypto/rsa/rsa_ameth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
index 528b72b4b9..d2a6b8fcfa 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa_ameth.c,v 1.14 2015/02/11 04:05:14 beck Exp $ */ 1/* $OpenBSD: rsa_ameth.c,v 1.14.6.1 2015/12/04 04:13:43 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -298,7 +298,7 @@ rsa_pss_decode(const X509_ALGOR *alg, X509_ALGOR **pmaskHash)
298 if (pss->maskGenAlgorithm) { 298 if (pss->maskGenAlgorithm) {
299 ASN1_TYPE *param = pss->maskGenAlgorithm->parameter; 299 ASN1_TYPE *param = pss->maskGenAlgorithm->parameter;
300 if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1 && 300 if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1 &&
301 param->type == V_ASN1_SEQUENCE) { 301 param && param->type == V_ASN1_SEQUENCE) {
302 p = param->value.sequence->data; 302 p = param->value.sequence->data;
303 plen = param->value.sequence->length; 303 plen = param->value.sequence->length;
304 *pmaskHash = d2i_X509_ALGOR(NULL, &p, plen); 304 *pmaskHash = d2i_X509_ALGOR(NULL, &p, plen);