diff options
| -rw-r--r-- | package/u-boot/Makefile | 9 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-lib_rsa_rsa-sign_c | 56 |
2 files changed, 59 insertions, 6 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 69c7b6ed3..dd8f8868d 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2017.03 +PKG_VERSION:= 2017.07 PKG_RELEASE:= 1 -PKG_HASH:= f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f +PKG_HASH:= 5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= libressl-host dtc-host @@ -16,7 +16,7 @@ PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= beaglebone-black raspberry-pi raspberry-pi2 raspberry-pi3 atmel-ngw100 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 +PKG_SYSTEM_DEPENDS:= beaglebone-black raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -45,9 +45,6 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) CONFIG:= rpi_3_defconfig endif -ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y) -CONFIG:= atngw100_defconfig -endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) CONFIG:= Bananapro_defconfig UBOOT:= u-boot-sunxi-with-spl.bin diff --git a/package/u-boot/patches/patch-lib_rsa_rsa-sign_c b/package/u-boot/patches/patch-lib_rsa_rsa-sign_c new file mode 100644 index 000000000..dbc223368 --- /dev/null +++ b/package/u-boot/patches/patch-lib_rsa_rsa-sign_c @@ -0,0 +1,56 @@ +--- 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); |