Browse Source

u-boot: update to 2018.03

Waldemar Brodkorb 6 years ago
parent
commit
058eed9254
2 changed files with 2 additions and 58 deletions
  1. 2 2
      package/u-boot/Makefile
  2. 0 56
      package/u-boot/patches/patch-lib_rsa_rsa-sign_c

+ 2 - 2
package/u-boot/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		u-boot
-PKG_VERSION:=		2017.07
+PKG_VERSION:=		2018.03
 PKG_RELEASE:=		1
-PKG_HASH:=		5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff
+PKG_HASH:=		7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 HOST_BUILDDEP:=		libressl-host dtc-host

+ 0 - 56
package/u-boot/patches/patch-lib_rsa_rsa-sign_c

@@ -1,56 +0,0 @@
---- u-boot-2017.07.orig/lib/rsa/rsa-sign.c	2017-07-10 19:07:38.000000000 +0200
-+++ u-boot-2017.07/lib/rsa/rsa-sign.c	2017-07-16 21:35:13.901375261 +0200
-@@ -21,7 +21,7 @@
- #define HAVE_ERR_REMOVE_THREAD_STATE
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static void RSA_get0_key(const RSA *r,
-                  const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
-@@ -300,7 +300,7 @@ static int rsa_init(void)
- {
- 	int ret;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	ret = SSL_library_init();
- #else
- 	ret = OPENSSL_init_ssl(0, NULL);
-@@ -309,7 +309,7 @@ static int rsa_init(void)
- 		fprintf(stderr, "Failure to init SSL library\n");
- 		return -1;
- 	}
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_load_error_strings();
- 
- 	OpenSSL_add_all_algorithms();
-@@ -355,7 +355,7 @@ err_set_rsa:
- err_engine_init:
- 	ENGINE_free(e);
- err_engine_by_id:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	ENGINE_cleanup();
- #endif
- 	return ret;
-@@ -363,7 +363,7 @@ err_engine_by_id:
- 
- static void rsa_remove(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	CRYPTO_cleanup_all_ex_data();
- 	ERR_free_strings();
- #ifdef HAVE_ERR_REMOVE_THREAD_STATE
-@@ -433,7 +433,7 @@ static int rsa_sign_with_key(RSA *rsa, s
- 		ret = rsa_err("Could not obtain signature");
- 		goto err_sign;
- 	}
--	#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+	#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 		EVP_MD_CTX_cleanup(context);
- 	#else
- 		EVP_MD_CTX_reset(context);