diff --git a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch index 9244e25a..65a5d7ee 100644 --- a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch +++ b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch @@ -10,8 +10,8 @@ + return 1; +#else /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ - return fp->_p - fp->_bf._base; + return fp_->_p - fp_->_bf._base; +#endif #elif defined __EMX__ /* emx+gcc */ - return fp->_ptr - fp->_buffer; + return fp_->_ptr - fp_->_buffer; #elif defined __minix /* Minix */ diff --git a/depends/common/gnutls/0002-hack-fix-about-rsa_compute_root_tr.patch b/depends/common/gnutls/0002-hack-fix-about-rsa_compute_root_tr.patch new file mode 100644 index 00000000..2347d008 --- /dev/null +++ b/depends/common/gnutls/0002-hack-fix-about-rsa_compute_root_tr.patch @@ -0,0 +1,41 @@ +--- a/lib/nettle/backport/rsa-sign-tr.c ++++ b/lib/nettle/backport/rsa-sign-tr.c +@@ -88,10 +88,10 @@ + * attacks which rely on faults on hardware, or even software MPI + * implementation. */ + int +-rsa_compute_root_tr(const struct rsa_public_key *pub, +- const struct rsa_private_key *key, +- void *random_ctx, nettle_random_func *random, +- mpz_t x, const mpz_t m) ++backport_rsa_compute_root_tr(const struct rsa_public_key *pub, ++ const struct rsa_private_key *key, ++ void *random_ctx, nettle_random_func *random, ++ mpz_t x, const mpz_t m) + { + int res; + mpz_t t, mb, xb, ri; +@@ -142,7 +142,7 @@ + + nn = mpz_size (pub->n); + +- res = rsa_compute_root_tr(pub, key, random_ctx, random, xz, ++ res = backport_rsa_compute_root_tr(pub, key, random_ctx, random, xz, + mpz_roinit_n(mz, m, nn)); + + if (res) +@@ -347,10 +347,10 @@ + * in buffer copying both in case of success or error. + */ + int +-rsa_compute_root_tr(const struct rsa_public_key *pub, +- const struct rsa_private_key *key, +- void *random_ctx, nettle_random_func *random, +- mpz_t x, const mpz_t m) ++backport_rsa_compute_root_tr(const struct rsa_public_key *pub, ++ const struct rsa_private_key *key, ++ void *random_ctx, nettle_random_func *random, ++ mpz_t x, const mpz_t m) + { + TMP_GMP_DECL (l, mp_limb_t); + mp_size_t nn = mpz_size(pub->n); diff --git a/depends/common/gnutls/gnutls.sha256 b/depends/common/gnutls/gnutls.sha256 index 2575b5e0..983d4a4a 100644 --- a/depends/common/gnutls/gnutls.sha256 +++ b/depends/common/gnutls/gnutls.sha256 @@ -1 +1 @@ -0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 +2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b diff --git a/depends/common/gnutls/gnutls.txt b/depends/common/gnutls/gnutls.txt index 70528558..a7104923 100644 --- a/depends/common/gnutls/gnutls.txt +++ b/depends/common/gnutls/gnutls.txt @@ -1 +1 @@ -gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz +gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.4.tar.xz