1 files changed, 0 insertions, 96 deletions
diff --git a/package/boot/uboot-mvebu/patches/0012-tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch b/package/boot/uboot-mvebu/patches/0012-tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch
deleted file mode 100644
index 882969905c..0000000000
--- a/package/boot/uboot-mvebu/patches/0012-tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 65030804dc57f3488e4ffe21e72fc65cd245cb98 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Mon, 8 May 2017 21:31:20 +0200
-Subject: [PATCH 2/2] tools: kwbimage fix build with OpenSSL 1.1.x
-
-The rsa_st struct has been made opaque in 1.1.x, add forward compatible
-code to access the n, e, d members of rsa_struct.
-
-EVP_MD_CTX_cleanup has been removed in 1.1.x and EVP_MD_CTX_reset should be
-called to reinitialise an already created structure.
-
-Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
----
- tools/kwbimage.c | 36 ++++++++++++++++++++++++++++++------
- 1 file changed, 30 insertions(+), 6 deletions(-)
-
---- a/tools/kwbimage.c
-+++ b/tools/kwbimage.c
-@@ -18,10 +18,30 @@
- #include "kwbimage.h"
- 
- #ifdef CONFIG_KWB_SECURE
-+#include <openssl/bn.h>
- #include <openssl/rsa.h>
- #include <openssl/pem.h>
- #include <openssl/err.h>
- #include <openssl/evp.h>
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+static void RSA_get0_key(const RSA *r,
-+                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+   if (n != NULL)
-+       *n = r->n;
-+   if (e != NULL)
-+       *e = r->e;
-+   if (d != NULL)
-+       *d = r->d;
-+}
-+
-+#else
-+void EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
-+{
-+	EVP_MD_CTX_reset(ctx);
-+}
-+#endif
- #endif
- 
- static struct image_cfg_element *image_cfg;
-@@ -470,12 +490,16 @@ static int kwb_export_pubkey(RSA *key, s
- 			     char *keyname)
- {
- 	int size_exp, size_mod, size_seq;
-+	const BIGNUM *key_e, *key_n;
- 	uint8_t *cur;
- 	char *errmsg = "Failed to encode %s\n";
- 
--	if (!key || !key->e || !key->n || !dst) {
-+	RSA_get0_key(key, NULL, &key_e, NULL);
-+	RSA_get0_key(key, &key_n, NULL, NULL);
-+
-+	if (!key || !key_e || !key_n || !dst) {
- 		fprintf(stderr, "export pk failed: (%p, %p, %p, %p)",
--			key, key->e, key->n, dst);
-+			key, key_e, key_n, dst);
- 		fprintf(stderr, errmsg, keyname);
- 		return -EINVAL;
- 	}
-@@ -490,8 +514,8 @@ static int kwb_export_pubkey(RSA *key, s
- 	 * do the encoding manually.
- 	 */
- 
--	size_exp = BN_num_bytes(key->e);
--	size_mod = BN_num_bytes(key->n);
-+	size_exp = BN_num_bytes(key_e);
-+	size_mod = BN_num_bytes(key_n);
- 	size_seq = 4 + size_mod + 4 + size_exp;
- 
- 	if (size_mod > 256) {
-@@ -520,14 +544,14 @@ static int kwb_export_pubkey(RSA *key, s
- 	*cur++ = 0x82;
- 	*cur++ = (size_mod >> 8) & 0xFF;
- 	*cur++ = size_mod & 0xFF;
--	BN_bn2bin(key->n, cur);
-+	BN_bn2bin(key_n, cur);
- 	cur += size_mod;
- 	/* Exponent */
- 	*cur++ = 0x02;		/* INTEGER */
- 	*cur++ = 0x82;
- 	*cur++ = (size_exp >> 8) & 0xFF;
- 	*cur++ = size_exp & 0xFF;
--	BN_bn2bin(key->e, cur);
-+	BN_bn2bin(key_e, cur);
- 
- 	if (hashf) {
- 		struct hash_v1 pk_hash;