diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-07 16:57:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:28 +0000 |
commit | 0ed23c1a0adca786211624bd0041d2a089f0c8f6 (patch) | |
tree | 24d3d46452409f82e87706c8a3b25870e534c7f0 /meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch | |
parent | 5c12661f8cae252b850f749b1809ca5fd23b5815 (diff) | |
download | ast2050-yocto-poky-0ed23c1a0adca786211624bd0041d2a089f0c8f6.zip ast2050-yocto-poky-0ed23c1a0adca786211624bd0041d2a089f0c8f6.tar.gz |
openssl: fix for CVE-2015-3194
(From OE-Core rev: edff5fc629c8f70191bd33c731084e8217780a38)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch new file mode 100644 index 0000000..13d4891 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch @@ -0,0 +1,45 @@ +From c394a488942387246653833359a5c94b5832674e Mon Sep 17 00:00:00 2001 +From: "Dr. Stephen Henson" <steve@openssl.org> +Date: Fri, 2 Oct 2015 12:35:19 +0100 +Subject: [PATCH] Add PSS parameter check. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Avoid seg fault by checking mgf1 parameter is not NULL. This can be +triggered during certificate verification so could be a DoS attack +against a client or a server enabling client authentication. + +Thanks to Loïc Jonas Etienne (Qnective AG) for discovering this bug. + +CVE-2015-3194 + +Reviewed-by: Richard Levitte <levitte@openssl.org> + +Upstream-Status: Backport + +This patch was imported from +https://git.openssl.org/?p=openssl.git;a=commit;h=c394a488942387246653833359a5c94b5832674e + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + crypto/rsa/rsa_ameth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c +index ca3922e..4e06218 100644 +--- a/crypto/rsa/rsa_ameth.c ++++ b/crypto/rsa/rsa_ameth.c +@@ -268,7 +268,7 @@ static X509_ALGOR *rsa_mgf1_decode(X509_ALGOR *alg) + { + const unsigned char *p; + int plen; +- if (alg == NULL) ++ if (alg == NULL || alg->parameter == NULL) + return NULL; + if (OBJ_obj2nid(alg->algorithm) != NID_mgf1) + return NULL; +-- +2.3.5 + |