diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1g.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch b/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch new file mode 100644 index 0000000000..afd283e3f8 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 748270554824d2a51d1718f52a8d3ab34116bbfb Mon Sep 17 00:00:00 2001 | ||
2 | From: "Dr. Stephen Henson" <steve@openssl.org> | ||
3 | Date: Wed, 15 Oct 2014 01:53:55 +0100 | ||
4 | Subject: [PATCH] Fix for session tickets memory leak. | ||
5 | |||
6 | CVE-2014-3567 | ||
7 | |||
8 | Reviewed-by: Rich Salz <rsalz@openssl.org> | ||
9 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
10 | --- | ||
11 | ssl/t1_lib.c | 3 +++ | ||
12 | 1 file changed, 3 insertions(+) | ||
13 | |||
14 | diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c | ||
15 | index 879467c..77fe232 100644 | ||
16 | --- a/ssl/t1_lib.c | ||
17 | +++ b/ssl/t1_lib.c | ||
18 | @@ -3380,7 +3380,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, | ||
19 | HMAC_Final(&hctx, tick_hmac, NULL); | ||
20 | HMAC_CTX_cleanup(&hctx); | ||
21 | if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) | ||
22 | + { | ||
23 | + EVP_CIPHER_CTX_cleanup(&ctx); | ||
24 | return 2; | ||
25 | + } | ||
26 | /* Attempt to decrypt session data */ | ||
27 | /* Move p after IV to start of encrypted ticket, update length */ | ||
28 | p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx); | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb index 3ec5ddcfc0..8afb21eedf 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb | |||
@@ -45,6 +45,7 @@ SRC_URI += "file://configure-targets.patch \ | |||
45 | file://run-ptest \ | 45 | file://run-ptest \ |
46 | file://openssl-fix-CVE-2014-3566.patch \ | 46 | file://openssl-fix-CVE-2014-3566.patch \ |
47 | file://openssl-fix-CVE-2014-3513.patch \ | 47 | file://openssl-fix-CVE-2014-3513.patch \ |
48 | file://openssl-fix-CVE-2014-3567.patch \ | ||
48 | " | 49 | " |
49 | 50 | ||
50 | SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" | 51 | SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" |