diff options
| author | beck <> | 2015-12-03 23:03:10 +0000 |
|---|---|---|
| committer | beck <> | 2015-12-03 23:03:10 +0000 |
| commit | cde255c048aa42af5b2398258671abd87aa3cf52 (patch) | |
| tree | 1d4b0b76407688f454d9987cbf32190fde86053a | |
| parent | cbbf11ff99cb7267314ad46f33373a969e949054 (diff) | |
| download | openbsd-cde255c048aa42af5b2398258671abd87aa3cf52.tar.gz openbsd-cde255c048aa42af5b2398258671abd87aa3cf52.tar.bz2 openbsd-cde255c048aa42af5b2398258671abd87aa3cf52.zip | |
Fix for OpenSSL CVE-2015-3194
ok krw@
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_ameth.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index 528b72b4b9..b66c749293 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/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.15 2015/12/03 23:03:10 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); |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c index 528b72b4b9..b66c749293 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.15 2015/12/03 23:03:10 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); |