openssl: Drop CVE patches

The CVEs have been fixed in upstream poky/rocko.

Signed-off-by: Martin Borg <martin.borg@enea.com>

3 files changed, 0 insertions, 97 deletions

diff --git a/recipes-connectivity/openssl/openssl/CVE-2017-3735.patch b/recipes-connectivity/openssl/openssl/CVE-2017-3735.patch
deleted file mode 100644
index b0f8189..0000000
--- a/recipes-connectivity/openssl/openssl/CVE-2017-3735.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31c8b265591a0aaa462a1f3eb5770661aaac67db Mon Sep 17 00:00:00 2001
-From: Rich Salz <rsalz@openssl.org>
-Date: Tue, 22 Aug 2017 11:44:41 -0400
-Subject: [PATCH] Avoid out-of-bounds read
-
-Fixes CVE-2017-3735
-
-CVE: CVE-2017-3735
-Upstream-Status: Backport
-
-Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
-(Merged from https://github.com/openssl/openssl/pull/4276)
-
-(cherry picked from commit b23171744b01e473ebbfd6edad70c1c3825ffbcd)
-Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
----
- crypto/x509v3/v3_addr.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
-index 1290dec..af080a0 100644
---- a/crypto/x509v3/v3_addr.c
-+++ b/crypto/x509v3/v3_addr.c
-@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
-  */
- unsigned int v3_addr_get_afi(const IPAddressFamily *f)
- {
--    return ((f != NULL &&
--             f->addressFamily != NULL && f->addressFamily->data != NULL)
--            ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
--            : 0);
-+    if (f == NULL
-+            || f->addressFamily == NULL
-+            || f->addressFamily->data == NULL
-+            || f->addressFamily->length < 2)
-+        return 0;
-+    return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
- }
- 
- /*
--- 
-1.9.1
-
diff --git a/recipes-connectivity/openssl/openssl/CVE-2017-3737.patch b/recipes-connectivity/openssl/openssl/CVE-2017-3737.patch
deleted file mode 100644
index 3a7b5b2..0000000
--- a/recipes-connectivity/openssl/openssl/CVE-2017-3737.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 898fb884b706aaeb283de4812340bb0bde8476dc Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Wed, 29 Nov 2017 14:04:01 +0000
-Subject: [PATCH] Don't allow read/write after fatal error
-
-OpenSSL 1.0.2 (starting from version 1.0.2b) introduced an "error state"
-mechanism. The intent was that if a fatal error occurred during a handshake
-then OpenSSL would move into the error state and would immediately fail if
-you attempted to continue the handshake. This works as designed for the
-explicit handshake functions (SSL_do_handshake(), SSL_accept() and
-SSL_connect()), however due to a bug it does not work correctly if
-SSL_read() or SSL_write() is called directly. In that scenario, if the
-handshake fails then a fatal error will be returned in the initial function
-call. If SSL_read()/SSL_write() is subsequently called by the application
-for the same SSL object then it will succeed and the data is passed without
-being decrypted/encrypted directly from the SSL/TLS record layer.
-
-In order to exploit this issue an attacker would have to trick an
-application into behaving incorrectly by issuing an SSL_read()/SSL_write()
-after having already received a fatal error.
-
-Thanks to David Benjamin (Google) for reporting this issue and suggesting
-this fix.
-
-CVE: CVE-2017-3737
-Upstream-Status: Backport
-
-Reviewed-by: Rich Salz <rsalz@openssl.org>
-Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
----
- ssl/ssl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssl/ssl.h b/ssl/ssl.h
-index 90aeb0c..3cf96a2 100644
---- a/ssl/ssl.h
-+++ b/ssl/ssl.h
-@@ -1727,7 +1727,7 @@ extern "C" {
- # define SSL_ST_BEFORE                   0x4000
- # define SSL_ST_OK                       0x03
- # define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
--# define SSL_ST_ERR                      0x05
-+# define SSL_ST_ERR                      (0x05|SSL_ST_INIT)
- 
- # define SSL_CB_LOOP                     0x01
- # define SSL_CB_EXIT                     0x02
--- 
-1.9.1
-
diff --git a/recipes-connectivity/openssl/openssl_%.bbappend b/recipes-connectivity/openssl/openssl_%.bbappend
deleted file mode 100644
index 7e81042..0000000
--- a/recipes-connectivity/openssl/openssl_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://CVE-2017-3735.patch \
-            file://CVE-2017-3737.patch \
-           "