libgcrypt 1.8.6 -> 1.10.1

562.01 -> 783.14 kB
This commit is contained in:
Marcin Cieślak 2023-03-24 02:03:03 +01:00 committed by Thierry Laurion
parent b97f34ecc3
commit 15182922fd
No known key found for this signature in database
GPG Key ID: E7B4A71658E36A93
2 changed files with 6 additions and 21 deletions

View File

@ -1,10 +1,10 @@
modules-$(CONFIG_GPG2) += libgcrypt
libgcrypt_version := 1.8.6
libgcrypt_version := 1.10.1
libgcrypt_dir := libgcrypt-$(libgcrypt_version)
libgcrypt_tar := libgcrypt-$(libgcrypt_version).tar.bz2
libgcrypt_url := https://gnupg.org/ftp/gcrypt/libgcrypt/$(libgcrypt_tar)
libgcrypt_hash := 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975
libgcrypt_hash := ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
libgcrypt_configure := \
$(CROSS_TOOLS) \
@ -15,6 +15,7 @@ libgcrypt_configure := \
--disable-static \
--with-gpg-error-prefix="$(INSTALL)" \
--disable-asm \
--disable-doc \
libgcrypt_target := $(MAKE_JOBS) \
DESTDIR="$(INSTALL)" \

View File

@ -1,6 +1,6 @@
diff -u -r libgcrypt-1.8.3-clean/configure libgcrypt-1.8.3/configure
--- libgcrypt-1.8.3-clean/configure 2018-06-13 00:39:33.000000000 -0700
+++ libgcrypt-1.8.3/configure 2020-01-12 13:32:34.840010800 -0800
diff -u -r libgcrypt-1.8.10-clean/configure libgcrypt-1.8.10/configure
--- libgcrypt-1.8.10-clean/configure 2018-06-13 00:39:33.000000000 -0700
+++ libgcrypt-1.8.10/configure 2020-01-12 13:32:34.840010800 -0800
@@ -11292,7 +11292,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@ -174,19 +174,3 @@ diff -u -r libgcrypt-1.8.3-clean/configure libgcrypt-1.8.3/configure
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h
index 75dd768..8a8dbd5 100644
--- a/random/jitterentropy-base-user.h
+++ b/random/jitterentropy-base-user.h
@@ -86,9 +86,9 @@ jent_get_nstime(u64 *out)
* not rely on that extra little entropy. */
if (!clock_gettime (CLOCK_REALTIME, &tv))
{
- tmp = time.tv_sec;
+ tmp = tv.tv_sec;
tmp = tmp << 32;
- tmp = tmp | time.tv_nsec;
+ tmp = tmp | tv.tv_nsec;
}
else
tmp = 0;