Skip to content

Commit

Permalink
update depends gnutls to version 3.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
AlwinEsch committed Mar 29, 2024
1 parent 98e28d0 commit 1c36487
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 4 deletions.
4 changes: 2 additions & 2 deletions depends/common/gnutls/0001-android-hackfix-fpending_c.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b
2 changes: 1 addition & 1 deletion depends/common/gnutls/gnutls.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1c36487

Please sign in to comment.