summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch
deleted file mode 100644
index 12dcfb7f3a..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From: Matt Caswell <matt@openssl.org>
2Date: Sun, 11 May 2014 23:38:37 +0000 (+0100)
3Subject: Fixed NULL pointer dereference. See PR#3321
4X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=b107586
5
6Fixed NULL pointer dereference. See PR#3321
7
8Patch borrowed from Fedora
9Upstream-Status: Backport
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11
12---
13
14diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
15index 40eb0dd..d961d12 100644
16--- a/ssl/s3_pkt.c
17+++ b/ssl/s3_pkt.c
18@@ -657,9 +657,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
19 SSL3_BUFFER *wb=&(s->s3->wbuf);
20 SSL_SESSION *sess;
21
22- if (wb->buf == NULL)
23- if (!ssl3_setup_write_buffer(s))
24- return -1;
25
26 /* first check if there is a SSL3_BUFFER still being written
27 * out. This will happen with non blocking IO */
28@@ -675,6 +672,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
29 /* if it went, fall through and send more stuff */
30 }
31
32+ if (wb->buf == NULL)
33+ if (!ssl3_setup_write_buffer(s))
34+ return -1;
35+
36 if (len == 0 && !create_empty_fragment)
37 return 0;
38