diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-17 22:00:30 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-17 21:00:22 +0100 |
| commit | 058eed92541c30a7b435235945415357a9cd7348 (patch) | |
| tree | 723a4fcfe9233f3e32ca7ce2100da620992b1891 /package/u-boot | |
| parent | e1e95a021796cbaed71456a0d20d16ea189ed4f8 (diff) | |
u-boot: update to 2018.03
Diffstat (limited to 'package/u-boot')
| -rw-r--r-- | package/u-boot/Makefile | 4 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-lib_rsa_rsa-sign_c | 56 |
2 files changed, 2 insertions, 58 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 0b976ac2f..3bb2674be 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.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 diff --git a/package/u-boot/patches/patch-lib_rsa_rsa-sign_c b/package/u-boot/patches/patch-lib_rsa_rsa-sign_c deleted file mode 100644 index dbc223368..000000000 --- a/package/u-boot/patches/patch-lib_rsa_rsa-sign_c +++ /dev/null @@ -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); |