diff --git a/.checkpackageignore b/.checkpackageignore index c88968e4d5..cd858d1732 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -661,7 +661,6 @@ package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-mus package/libnfc/0001-autotools-make-example-build-optional.patch lib_patch.Upstream package/libnids/0001-libpcap-use-pkg-config.patch lib_patch.Upstream package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch lib_patch.Upstream -package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch lib_patch.Upstream package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch lib_patch.Upstream package/libodb-mysql/0002-mariadb-FTBFS-fix.patch lib_patch.Upstream package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch lib_patch.Upstream diff --git a/package/Config.in b/package/Config.in index 137f74ed82..899301078e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2093,7 +2093,6 @@ menu "Networking" source "package/libnids/Config.in" source "package/libnl/Config.in" source "package/libnpupnp/Config.in" - source "package/liboauth/Config.in" source "package/liboping/Config.in" source "package/libosip2/Config.in" source "package/libpagekite/Config.in" diff --git a/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch b/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 945307bba8..0000000000 --- a/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 5f1c949b1703367f7f06454fcff650bdb7bac840 Mon Sep 17 00:00:00 2001 -From: DJ Lucas -Date: Sun, 9 Sep 2018 15:46:15 +0200 -Subject: [PATCH] Fixes build issue with OpenSSL-1.1.0 - -Downloaded from -http://www.linuxfromscratch.org/patches/blfs/svn/liboauth-1.0.3-openssl-1.1.0-2.patch - -Patch was sent upstream: https://github.com/x42/liboauth/issues/9 - -Signed-off-by: Bernd Kuhls ---- - src/hash.c | 65 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 44 insertions(+), 21 deletions(-) - -diff --git a/src/hash.c b/src/hash.c -index 17ff5c8..b7958f7 100644 ---- a/src/hash.c -+++ b/src/hash.c -@@ -362,6 +362,11 @@ looser: - #include "oauth.h" // base64 encode fn's. - #include - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#define EVP_MD_CTX_new EVP_MD_CTX_create -+#define EVP_MD_CTX_free EVP_MD_CTX_destroy -+#endif -+ - char *oauth_sign_hmac_sha1 (const char *m, const char *k) { - return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k))); - } -@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { - unsigned char *sig = NULL; - unsigned char *passphrase = NULL; - unsigned int len=0; -- EVP_MD_CTX md_ctx; -+ EVP_MD_CTX *md_ctx; - - EVP_PKEY *pkey; - BIO *in; -@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { - return xstrdup("liboauth/OpenSSL: can not read private key"); - } - -+ md_ctx = EVP_MD_CTX_new(); -+ if (md_ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ - len = EVP_PKEY_size(pkey); - sig = (unsigned char*)xmalloc((len+1)*sizeof(char)); - -- EVP_SignInit(&md_ctx, EVP_sha1()); -- EVP_SignUpdate(&md_ctx, m, strlen(m)); -- if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) { -+ EVP_SignInit(md_ctx, EVP_sha1()); -+ EVP_SignUpdate(md_ctx, m, strlen(m)); -+ if (EVP_SignFinal (md_ctx, sig, &len, pkey)) { - char *tmp; - sig[len] = '\0'; - tmp = oauth_encode_base64(len,sig); - OPENSSL_free(sig); - EVP_PKEY_free(pkey); -+ EVP_MD_CTX_free(md_ctx); - return tmp; - } -+ EVP_MD_CTX_free(md_ctx); - return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed"); - } - - int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { -- EVP_MD_CTX md_ctx; -+ EVP_MD_CTX *md_ctx; - EVP_PKEY *pkey; - BIO *in; - X509 *cert = NULL; -@@ -437,13 +449,18 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { - return -2; - } - -+ md_ctx = EVP_MD_CTX_new(); -+ if (md_ctx == NULL) { -+ return -2; -+ } -+ - b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s)); - slen = oauth_decode_base64(b64d, s); - -- EVP_VerifyInit(&md_ctx, EVP_sha1()); -- EVP_VerifyUpdate(&md_ctx, m, strlen(m)); -- err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey); -- EVP_MD_CTX_cleanup(&md_ctx); -+ EVP_VerifyInit(md_ctx, EVP_sha1()); -+ EVP_VerifyUpdate(md_ctx, m, strlen(m)); -+ err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey); -+ EVP_MD_CTX_free(pkey); - EVP_PKEY_free(pkey); - xfree(b64d); - return (err); -@@ -455,35 +472,41 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { - */ - char *oauth_body_hash_file(char *filename) { - unsigned char fb[BUFSIZ]; -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - size_t len=0; - unsigned char *md; - FILE *F= fopen(filename, "r"); - if (!F) return NULL; - -- EVP_MD_CTX_init(&ctx); -- EVP_DigestInit(&ctx,EVP_sha1()); -+ ctx = EVP_MD_CTX_new(); -+ if (ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ EVP_DigestInit(ctx,EVP_sha1()); - while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) { -- EVP_DigestUpdate(&ctx, fb, len); -+ EVP_DigestUpdate(ctx, fb, len); - } - fclose(F); - len=0; - md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); -- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); -- EVP_MD_CTX_cleanup(&ctx); -+ EVP_DigestFinal(ctx, md,(unsigned int*) &len); -+ EVP_MD_CTX_free(ctx); - return oauth_body_hash_encode(len, md); - } - - char *oauth_body_hash_data(size_t length, const char *data) { -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - size_t len=0; - unsigned char *md; - md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); -- EVP_MD_CTX_init(&ctx); -- EVP_DigestInit(&ctx,EVP_sha1()); -- EVP_DigestUpdate(&ctx, data, length); -- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); -- EVP_MD_CTX_cleanup(&ctx); -+ ctx = EVP_MD_CTX_new(); -+ if (ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ EVP_DigestInit(ctx,EVP_sha1()); -+ EVP_DigestUpdate(ctx, data, length); -+ EVP_DigestFinal(ctx, md,(unsigned int*) &len); -+ EVP_MD_CTX_free(ctx); - return oauth_body_hash_encode(len, md); - } - --- -2.14.4 - diff --git a/package/liboauth/Config.in b/package/liboauth/Config.in deleted file mode 100644 index 4ed0efa6b1..0000000000 --- a/package/liboauth/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBOAUTH - bool "liboauth" - select BR2_PACKAGE_OPENSSL - help - liboauth is a collection of c functions implementing the oAuth - Core 1.0 Rev A standard API. liboauth provides basic functions - to escape and encode parameters according to oAuth specs and - offers high-level functions to sign requests or verify - signatures. - - http://liboauth.sourceforge.net/ diff --git a/package/liboauth/liboauth.hash b/package/liboauth/liboauth.hash deleted file mode 100644 index 5fa0353d50..0000000000 --- a/package/liboauth/liboauth.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f liboauth-1.0.3.tar.gz -sha256 c30608672733bf3abd2ccf6f3206be8d91b7ee58b007b2fdbcfbc61c655e7fb7 COPYING.MIT diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk deleted file mode 100644 index bd54330ddf..0000000000 --- a/package/liboauth/liboauth.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# liboauth -# -################################################################################ - -LIBOAUTH_VERSION = 1.0.3 -LIBOAUTH_SITE = http://downloads.sourceforge.net/project/liboauth -LIBOAUTH_INSTALL_STAGING = YES -LIBOAUTH_DEPENDENCIES += host-pkgconf openssl -LIBOAUTH_LICENSE = MIT -LIBOAUTH_LICENSE_FILES = COPYING.MIT - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -LIBOAUTH_DEPENDENCIES += libcurl -else -LIBOAUTH_CONF_OPTS += --disable-libcurl -endif - -$(eval $(autotools-package))