summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2015-12-08 00:57:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:08:28 (GMT)
commit0ed23c1a0adca786211624bd0041d2a089f0c8f6 (patch)
tree24d3d46452409f82e87706c8a3b25870e534c7f0 /meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch
parent5c12661f8cae252b850f749b1809ca5fd23b5815 (diff)
downloadpoky-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.patch45
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 @@
1From c394a488942387246653833359a5c94b5832674e Mon Sep 17 00:00:00 2001
2From: "Dr. Stephen Henson" <steve@openssl.org>
3Date: Fri, 2 Oct 2015 12:35:19 +0100
4Subject: [PATCH] Add PSS parameter check.
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Avoid seg fault by checking mgf1 parameter is not NULL. This can be
10triggered during certificate verification so could be a DoS attack
11against a client or a server enabling client authentication.
12
13Thanks to Loïc Jonas Etienne (Qnective AG) for discovering this bug.
14
15CVE-2015-3194
16
17Reviewed-by: Richard Levitte <levitte@openssl.org>
18
19Upstream-Status: Backport
20
21This patch was imported from
22https://git.openssl.org/?p=openssl.git;a=commit;h=c394a488942387246653833359a5c94b5832674e
23
24Signed-off-by: Armin Kuster <akuster@mvista.com>
25
26---
27 crypto/rsa/rsa_ameth.c | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
31index ca3922e..4e06218 100644
32--- a/crypto/rsa/rsa_ameth.c
33+++ b/crypto/rsa/rsa_ameth.c
34@@ -268,7 +268,7 @@ static X509_ALGOR *rsa_mgf1_decode(X509_ALGOR *alg)
35 {
36 const unsigned char *p;
37 int plen;
38- if (alg == NULL)
39+ if (alg == NULL || alg->parameter == NULL)
40 return NULL;
41 if (OBJ_obj2nid(alg->algorithm) != NID_mgf1)
42 return NULL;
43--
442.3.5
45