[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: gcrypt: update to 1.10.1
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Oct 13 16:37:34 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
8883fd6f by Steve Lhomme at 2022-10-13T17:21:33+02:00
contrib: gcrypt: update to 1.10.1
Enabled blake2 and chacha20 because there are some missing ifdef throughout the
code to enable/disable some code if they are not set. The easiest fix is to
just enable them, rather than patching the code.
- - - - -
f44d18f7 by Steve Lhomme at 2022-10-13T17:21:34+02:00
ci: update win64 gcc image to include protoc 3.4.1
- - - - -
10 changed files:
- − contrib/src/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
- − contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
- − contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch
- contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch
- contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch
- − contrib/src/gcrypt/64bits-relocation.patch
- contrib/src/gcrypt/SHA512SUMS
- − contrib/src/gcrypt/clang-mips64.patch
- contrib/src/gcrypt/rules.mak
- extras/ci/gitlab-ci.yml
Changes:
=====================================
contrib/src/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From e09d5f889ce7c00e9ebe6ef0173aa7a27b975646 Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni at videolabs.io>
-Date: Fri, 24 Apr 2020 10:26:25 +0200
-Subject: [PATCH] cipher: Makefile.am: force --tag=CC for .S files
-
-When building the library for armv7 on iOS, the following error prevents
-the success of the compilation:
-
-libtool: compile: unable to infer tagged configuration
-libtool: error: specify a tag with '--tag'
----
- cipher/Makefile.am | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cipher/Makefile.am b/cipher/Makefile.am
-index ac0ec58e..a2cb409c 100644
---- a/cipher/Makefile.am
-+++ b/cipher/Makefile.am
-@@ -125,3 +125,8 @@ tiger.o: $(srcdir)/tiger.c
-
- tiger.lo: $(srcdir)/tiger.c
- `echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) `
-+
-+SUFFIXES = .S
-+
-+.S.lo:
-+ $(LIBTOOL) --mode compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) -c -I ../ "$<" -o "$@"
---
-2.26.1
=====================================
contrib/src/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch deleted
=====================================
@@ -1,43 +0,0 @@
-From ed41d6d6fb4551342b22ef763de1bd60e964e186 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Thu, 22 Mar 2018 23:32:36 +0200
-Subject: [PATCH 1/2] random: Don't assume that _WIN64 implies x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* random/rndw32.c: Change _WIN64 ifdef into __x86_64__.
---
-
-This fixes building this file for windows on aarch64.
-
-Signed-off-by: Martin Storsjö <martin at martin.st>
----
- random/rndw32.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/random/rndw32.c b/random/rndw32.c
-index 7e9ac50..08a8867 100644
---- a/random/rndw32.c
-+++ b/random/rndw32.c
-@@ -986,7 +986,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
-
- On AMD64, TSC is always available and intrinsic is provided for accessing
- it. */
--#ifdef __WIN64__
-+#ifdef __x86_64__
- {
- unsigned __int64 aint64;
-
-@@ -1024,7 +1024,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
- (*add) (&aword, sizeof (aword), origin );
- }
- }
--#endif /*__WIN64__*/
-+#endif /*__x86_64__*/
-
-
- }
---
-2.7.4
-
=====================================
contrib/src/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch deleted
=====================================
@@ -1,207 +0,0 @@
-From ec0a2f25c0f64a7b65b373508ce9081e10461965 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Thu, 22 Mar 2018 23:32:37 +0200
-Subject: [PATCH 2/2] aarch64: mpi: Fix building the mpi aarch64 assembly for
- windows
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* mpi/aarch64/mpih-add1.S: Use ELF macro.
-* mpi/aarch64/mpih-mul1.S: Use ELF macro.
-* mpi/aarch64/mpih-mul2.S: Use ELF macro.
-* mpi/aarch64/mpih-mul3.S: Use ELF macro.
-* mpi/aarch64/mpih-sub1.S: Use ELF macro.
-* mpi/asm-common-aarch64.h: New.
---
-
-The mpi aarch64 assembly is enabled as soon as the compiler supports
-inline assembly, without checking for .type and .size, as is done
-for the rest of the assembly in cipher/*.S. (The .type and .size
-directives are only supported on ELF.)
-
-Signed-off-by: Martin Storsjö <martin at martin.st>
----
- mpi/aarch64/mpih-add1.S | 5 +++--
- mpi/aarch64/mpih-mul1.S | 5 +++--
- mpi/aarch64/mpih-mul2.S | 5 +++--
- mpi/aarch64/mpih-mul3.S | 5 +++--
- mpi/aarch64/mpih-sub1.S | 5 +++--
- mpi/asm-common-aarch64.h | 30 ++++++++++++++++++++++++++++++
- 6 files changed, 45 insertions(+), 10 deletions(-)
- create mode 100644 mpi/asm-common-aarch64.h
-
-diff --git a/mpi/aarch64/mpih-add1.S b/mpi/aarch64/mpih-add1.S
-index fa8cd01..4ead1c2 100644
---- a/mpi/aarch64/mpih-add1.S
-+++ b/mpi/aarch64/mpih-add1.S
-@@ -22,6 +22,7 @@
-
- #include "sysdep.h"
- #include "asm-syntax.h"
-+#include "asm-common-aarch64.h"
-
- /*******************
- * mpi_limb_t
-@@ -34,7 +35,7 @@
- .text
-
- .globl _gcry_mpih_add_n
--.type _gcry_mpih_add_n,%function
-+ELF(.type _gcry_mpih_add_n,%function)
- _gcry_mpih_add_n:
- and x5, x3, #3;
- adds xzr, xzr, xzr; /* clear carry flag */
-@@ -68,4 +69,4 @@ _gcry_mpih_add_n:
- .Lend:
- adc x0, xzr, xzr;
- ret;
--.size _gcry_mpih_add_n,.-_gcry_mpih_add_n;
-+ELF(.size _gcry_mpih_add_n,.-_gcry_mpih_add_n;)
-diff --git a/mpi/aarch64/mpih-mul1.S b/mpi/aarch64/mpih-mul1.S
-index 65e98fe..8a86269 100644
---- a/mpi/aarch64/mpih-mul1.S
-+++ b/mpi/aarch64/mpih-mul1.S
-@@ -22,6 +22,7 @@
-
- #include "sysdep.h"
- #include "asm-syntax.h"
-+#include "asm-common-aarch64.h"
-
- /*******************
- * mpi_limb_t
-@@ -34,7 +35,7 @@
- .text
-
- .globl _gcry_mpih_mul_1
--.type _gcry_mpih_mul_1,%function
-+ELF(.type _gcry_mpih_mul_1,%function)
- _gcry_mpih_mul_1:
- and x5, x2, #3;
- mov x4, xzr;
-@@ -93,4 +94,4 @@ _gcry_mpih_mul_1:
- .Lend:
- mov x0, x4;
- ret;
--.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1;
-+ELF(.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1;)
-diff --git a/mpi/aarch64/mpih-mul2.S b/mpi/aarch64/mpih-mul2.S
-index bd3b2c9..c7c08e5 100644
---- a/mpi/aarch64/mpih-mul2.S
-+++ b/mpi/aarch64/mpih-mul2.S
-@@ -22,6 +22,7 @@
-
- #include "sysdep.h"
- #include "asm-syntax.h"
-+#include "asm-common-aarch64.h"
-
- /*******************
- * mpi_limb_t
-@@ -34,7 +35,7 @@
- .text
-
- .globl _gcry_mpih_addmul_1
--.type _gcry_mpih_addmul_1,%function
-+ELF(.type _gcry_mpih_addmul_1,%function)
- _gcry_mpih_addmul_1:
- and x5, x2, #3;
- mov x6, xzr;
-@@ -105,4 +106,4 @@ _gcry_mpih_addmul_1:
- .Lend:
- mov x0, x6;
- ret;
--.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1;
-+ELF(.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1;)
-diff --git a/mpi/aarch64/mpih-mul3.S b/mpi/aarch64/mpih-mul3.S
-index a58bc53..ccc961e 100644
---- a/mpi/aarch64/mpih-mul3.S
-+++ b/mpi/aarch64/mpih-mul3.S
-@@ -22,6 +22,7 @@
-
- #include "sysdep.h"
- #include "asm-syntax.h"
-+#include "asm-common-aarch64.h"
-
- /*******************
- * mpi_limb_t
-@@ -34,7 +35,7 @@
- .text
-
- .globl _gcry_mpih_submul_1
--.type _gcry_mpih_submul_1,%function
-+ELF(.type _gcry_mpih_submul_1,%function)
- _gcry_mpih_submul_1:
- and x5, x2, #3;
- mov x7, xzr;
-@@ -118,4 +119,4 @@ _gcry_mpih_submul_1:
- .Loop_end:
- cinc x0, x7, cc;
- ret;
--.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1;
-+ELF(.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1;)
-diff --git a/mpi/aarch64/mpih-sub1.S b/mpi/aarch64/mpih-sub1.S
-index cbf2f08..4a66373 100644
---- a/mpi/aarch64/mpih-sub1.S
-+++ b/mpi/aarch64/mpih-sub1.S
-@@ -22,6 +22,7 @@
-
- #include "sysdep.h"
- #include "asm-syntax.h"
-+#include "asm-common-aarch64.h"
-
- /*******************
- * mpi_limb_t
-@@ -34,7 +35,7 @@
- .text
-
- .globl _gcry_mpih_sub_n
--.type _gcry_mpih_sub_n,%function
-+ELF(.type _gcry_mpih_sub_n,%function)
- _gcry_mpih_sub_n:
- and x5, x3, #3;
- subs xzr, xzr, xzr; /* prepare carry flag for sub */
-@@ -68,4 +69,4 @@ _gcry_mpih_sub_n:
- .Lend:
- cset x0, cc;
- ret;
--.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n;
-+ELF(.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n;)
-diff --git a/mpi/asm-common-aarch64.h b/mpi/asm-common-aarch64.h
-new file mode 100644
-index 0000000..1269413
---- /dev/null
-+++ b/mpi/asm-common-aarch64.h
-@@ -0,0 +1,30 @@
-+/* asm-common-aarch64.h - Common macros for AArch64 assembly
-+ *
-+ * Copyright (C) 2018 Martin Storsjö <martin at martin.st>
-+ *
-+ * This file is part of Libgcrypt.
-+ *
-+ * Libgcrypt is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as
-+ * published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * Libgcrypt is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef MPI_ASM_COMMON_AARCH64_H
-+#define MPI_ASM_COMMON_AARCH64_H
-+
-+#ifdef __ELF__
-+# define ELF(...) __VA_ARGS__
-+#else
-+# define ELF(...) /*_*/
-+#endif
-+
-+#endif /* MPI_ASM_COMMON_AARCH64_H */
---
-2.7.4
-
=====================================
contrib/src/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch
=====================================
@@ -1,42 +1,38 @@
-From 95cc768cce8de579d0414830fe1d93c15f9594a7 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 19 Jun 2020 10:40:06 +0200
-Subject: [PATCH 7/9] random: don't use API's that are forbidden in UWP apps to
- init the random generator
-
----
- random/rndw32.c | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/random/rndw32.c b/random/rndw32.c
-index aefc7275..45d1e7e7 100644
---- a/random/rndw32.c
-+++ b/random/rndw32.c
-@@ -337,6 +337,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins),
+--- gcrypt/random/rndw32.c.orig 2020-03-03 13:49:52.000000000 +0100
++++ gcrypt/random/rndw32.c 2022-10-12 09:50:46.728155400 +0200
+@@ -338,7 +355,11 @@ read_mbm_data (void (*add)(const void*,
HANDLE hMBMData;
SharedData *mbmDataPtr;
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
hMBMData = OpenFileMapping (FILE_MAP_READ, FALSE, "$M$B$M$5$S$D$" );
++#else /* !WINAPI_PARTITION_DESKTOP */
++ hMBMData = NULL;
++#endif /* !WINAPI_PARTITION_DESKTOP */
if (hMBMData)
{
-@@ -351,6 +352,7 @@ read_mbm_data (void (*add)(const void*, size_t, enum random_origins),
- }
- CloseHandle (hMBMData);
+ mbmDataPtr = (SharedData*)MapViewOfFile (hMBMData, FILE_MAP_READ,0,0,0);
+@@ -439,8 +460,12 @@ registry_poll (void (*add)(const void*,
+ if ( debug_me )
+ log_debug ("rndw32#slow_gatherer_nt: get perf data\n" );
+
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ status = RegQueryValueEx (HKEY_PERFORMANCE_DATA, "Global", NULL,
+ NULL, (LPBYTE) pPerfData, &dwSize);
++#else /* !WINAPI_PARTITION_DESKTOP */
++ status = ERROR_NO_DATA;
++#endif /* !WINAPI_PARTITION_DESKTOP */
+ if (status == ERROR_SUCCESS)
+ {
+ if (!memcmp (pPerfData->Signature, L"PERF", 8))
+@@ -473,12 +498,14 @@ registry_poll (void (*add)(const void*,
+ xfree (pPerfData);
}
-+#endif /* WINAPI_PARTITION_DESKTOP */
- }
-
-@@ -359,6 +361,7 @@ static void
- registry_poll (void (*add)(const void*, size_t, enum random_origins),
- enum random_origins requester)
- {
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
- static int cbPerfData = PERFORMANCE_BUFFER_SIZE;
- int iterations;
- DWORD dwSize, status;
-@@ -478,6 +481,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins),
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ /* Although this isn't documented in the Win32 API docs, it's necessary
+ to explicitly close the HKEY_PERFORMANCE_DATA key after use (it's
+ implicitly opened on the first call to RegQueryValueEx()). If this
isn't done then any system components which provide performance data
can't be removed or changed while the handle remains active. */
RegCloseKey (HKEY_PERFORMANCE_DATA);
@@ -44,115 +40,111 @@ index aefc7275..45d1e7e7 100644
}
-@@ -496,6 +500,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),
-
- if ( !is_initialized )
- {
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
- HKEY hKey;
+@@ -501,6 +528,7 @@ slow_gatherer ( void (*add)(const void*,
if ( debug_me )
-@@ -565,6 +570,10 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),
- if (!pNtQuerySystemInformation || !pNtQueryInformationProcess)
- hNTAPI = NULL;
- }
-+#else /* !WINAPI_PARTITION_DESKTOP */
-+ hNetAPI32 = NULL;
-+ hNTAPI = NULL;
-+#endif /* !WINAPI_PARTITION_DESKTOP */
-
-
- is_initialized = 1;
-@@ -594,6 +603,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),
- }
- }
-
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
- /* Get disk I/O statistics for all the hard drives. 100 is an
- arbitrary failsafe limit. */
- for (drive_no = 0; drive_no < 100 ; drive_no++)
-@@ -628,6 +638,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins),
+ log_debug ("rndw32#slow_gatherer: init toolkit\n" );
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ /* Find out whether this is an NT server or workstation if necessary */
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE,
+ "SYSTEM\\CurrentControlSet\\Control\\ProductOptions",
+@@ -550,6 +578,7 @@ slow_gatherer ( void (*add)(const void*,
+ log_debug ("rndw32: No NETAPI found\n" );
+ }
}
- CloseHandle (hDevice);
- }
+#endif /* WINAPI_PARTITION_DESKTOP */
- /* In theory we should be using the Win32 performance query API to obtain
- unpredictable data from the system, however this is so unreliable (see
-@@ -786,12 +797,16 @@ _gcry_rndw32_gather_random (void (*add)(const void*, size_t,
-
- if (!is_initialized)
- {
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
- OSVERSIONINFO osvi = { sizeof( osvi ) };
+ /* Initialize the NT kernel native API function pointers if necessary */
+ hNTAPI = GetModuleHandle ("NTDll.dll");
+@@ -794,10 +823,12 @@ _gcry_rndw32_gather_random (void (*add)(
+ if ((s = getenv ("GCRYPT_RNDW32_DBG")) && atoi (s) > 0)
+ debug_me = 1;
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
GetVersionEx( &osvi );
if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)
log_fatal ("can only run on a Windows NT platform\n" );
system_is_w2000 = (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0);
-+#else /* !WINAPI_PARTITION_DESKTOP */
-+ system_is_w2000 = 0;
-+#endif /* !WINAPI_PARTITION_DESKTOP */
++#endif /* WINAPI_PARTITION_DESKTOP */
+
init_system_rng ();
is_initialized = 1;
- }
-@@ -842,14 +857,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
+@@ -856,22 +887,28 @@ _gcry_rndw32_gather_random_fast (void (*
ADDINT((SIZE_T)aptr); \
} while (0)
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
ADDPTR ( GetActiveWindow ());
ADDPTR ( GetCapture ());
ADDPTR ( GetClipboardOwner ());
ADDPTR ( GetClipboardViewer ());
-- ADDPTR ( GetCurrentProcess ());
-- ADDINT ( GetCurrentProcessId ());
-- ADDPTR ( GetCurrentThread ());
-- ADDINT ( GetCurrentThreadId ());
++#endif /* WINAPI_PARTITION_DESKTOP */
+ ADDPTR ( GetCurrentProcess ());
+ ADDINT ( GetCurrentProcessId ());
+ ADDPTR ( GetCurrentThread ());
+ ADDINT ( GetCurrentThreadId ());
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
ADDPTR ( GetDesktopWindow ());
ADDPTR ( GetFocus ());
ADDINT ( GetInputState ());
-@@ -858,6 +870,11 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
+ ADDINT ( GetMessagePos ());
+ ADDINT ( GetMessageTime ());
ADDPTR ( GetOpenClipboardWindow ());
++#endif /* WINAPI_PARTITION_DESKTOP */
ADDPTR ( GetProcessHeap ());
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
ADDPTR ( GetProcessWindowStation ());
+#endif /* WINAPI_PARTITION_DESKTOP */
-+ ADDPTR ( GetCurrentProcess ());
-+ ADDINT ( GetCurrentProcessId ());
-+ ADDPTR ( GetCurrentThread ());
-+ ADDINT ( GetCurrentThreadId ());
/* Following function in some cases stops returning events, and cannot
be used as an entropy source. */
/*ADDINT ( GetQueueStatus (QS_ALLEVENTS));*/
-@@ -871,6 +888,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
+@@ -883,6 +920,7 @@ _gcry_rndw32_gather_random_fast (void (*
+ #undef ADDPTR
+ }
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/* Get multiword system information: Current caret position, current
mouse cursor position. */
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
{
- POINT point;
+@@ -893,6 +931,7 @@ _gcry_rndw32_gather_random_fast (void (*
+ GetCursorPos (&point);
+ (*add) ( &point, sizeof (point), origin );
+ }
++#endif /* WINAPI_PARTITION_DESKTOP */
-@@ -922,10 +940,12 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
+ /* Get percent of memory in use, bytes of physical memory, bytes of
+ free physical memory, bytes in paging file, free bytes in paging
+@@ -928,6 +967,7 @@ _gcry_rndw32_gather_random_fast (void (*
+ (*add) ( &kernelTime, sizeof (kernelTime), origin );
+ (*add) ( &userTime, sizeof (userTime), origin );
+
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ /* Get the minimum and maximum working set size for the current
+ process. */
+ GetProcessWorkingSetSize (handle, &minimumWorkingSetSize,
+@@ -935,6 +975,7 @@ _gcry_rndw32_gather_random_fast (void (*
+ /* On 64-bit system, discard the high 32-bits. */
(*add) ( &minimumWorkingSetSize, sizeof (int), origin );
(*add) ( &maximumWorkingSetSize, sizeof (int), origin );
- }
+#endif /* WINAPI_PARTITION_DESKTOP */
+ }
- /* The following are fixed for the lifetime of the process so we only
+--- gcrypt/random/rndw32.c.orig 2022-10-12 11:53:15.439098100 +0200
++++ gcrypt/random/rndw32.c 2022-10-12 11:52:37.497979700 +0200
+@@ -983,6 +983,7 @@ _gcry_rndw32_gather_random_fast (void (*
* add them once */
-+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
if (!addedFixedItems)
{
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
STARTUPINFO startupInfo;
-@@ -938,6 +958,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t,
+
+ /* Get name of desktop, console window title, new window
+@@ -991,6 +992,7 @@ _gcry_rndw32_gather_random_fast (void (*
+ startupInfo.cb = sizeof (STARTUPINFO);
+ GetStartupInfo (&startupInfo);
(*add) ( &startupInfo, sizeof (STARTUPINFO), origin );
++#endif /* WINAPI_PARTITION_DESKTOP */
addedFixedItems = 1;
}
-+#endif /* WINAPI_PARTITION_DESKTOP */
- /* The performance of QPC varies depending on the architecture it's
- running on and on the OS, the MS documentation is vague about the
---
-2.26.0.windows.1
-
=====================================
contrib/src/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch
=====================================
@@ -27,7 +27,7 @@ index 45d1e7e7..8b0a38fa 100644
/* When we query the performance counters, we allocate an initial buffer and
-@@ -259,6 +262,7 @@ init_system_rng (void)
+@@ -260,6 +263,7 @@ init_system_rng (void)
system_rng_available = 0;
hRNGProv = NULL;
@@ -35,7 +35,7 @@ index 45d1e7e7..8b0a38fa 100644
hAdvAPI32 = GetModuleHandle ("AdvAPI32.dll");
if (!hAdvAPI32)
return;
-@@ -274,6 +278,19 @@ init_system_rng (void)
+@@ -275,6 +279,19 @@ init_system_rng (void)
This isn't exported by name, so we have to get it by ordinal. */
pRtlGenRandom = (RTLGENRANDOM)
GetProcAddress (hAdvAPI32, "SystemFunction036");
@@ -59,14 +59,14 @@ diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc4a552..a22acd41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -123,7 +123,9 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
- ../random/librandom.la \
+@@ -127,6 +127,10 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
../mpi/libmpi.la \
- ../compat/libcompat.la $(GPG_ERROR_LIBS)
--
+ ../compat/libcompat.la $(DL_LIBS) $(GPG_ERROR_LIBS)
+
+if HAVE_W32_SYSTEM
+libgcrypt_la_LIBADD += -lbcrypt
+endif
++
dumpsexp_SOURCES = dumpsexp.c
dumpsexp_CFLAGS = $(arch_gpg_error_cflags)
=====================================
contrib/src/gcrypt/64bits-relocation.patch deleted
=====================================
@@ -1,20 +0,0 @@
---- libgcrypt/cipher/rijndael.c.orig 2016-08-25 17:54:33.755153207 +0200
-+++ libgcrypt/cipher/rijndael.c 2016-08-25 17:54:36.655151003 +0200
-@@ -744,7 +744,7 @@
- const void *key = ctx->keyschenc;
- uintptr_t rounds = ctx->rounds;
- uintptr_t ret;
-- asm volatile ("movq %[encT], %%r8\n\t"
-+ asm volatile ("movabs %[encT], %%r8\n\t"
- "callq *%[ret]\n\t"
- : [ret] "=a" (ret),
- "+D" (key),
-@@ -1127,7 +1127,7 @@
- const void *key = ctx->keyschdec;
- uintptr_t rounds = ctx->rounds;
- uintptr_t ret;
-- asm volatile ("movq %[dectabs], %%r8\n\t"
-+ asm volatile ("movabs %[dectabs], %%r8\n\t"
- "callq *%[ret]\n\t"
- : [ret] "=a" (ret),
- "+D" (key),
=====================================
contrib/src/gcrypt/SHA512SUMS
=====================================
@@ -1 +1 @@
-c76d9c9dfb2b831177848b0df7e41d05d1587d28af5322ab0518c9200cdcb1470413940a414036559e7bbed3e24d2e89340f7f06026697f65492c00761cc6385 libgcrypt-1.7.10.tar.bz2
+e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13 libgcrypt-1.10.1.tar.bz2
\ No newline at end of file
=====================================
contrib/src/gcrypt/clang-mips64.patch deleted
=====================================
@@ -1,12 +0,0 @@
-diff -Naur libgcrypt.orig/mpi/longlong.h libgcrypt/mpi/longlong.h
---- libgcrypt.orig/mpi/longlong.h 2016-06-08 18:18:15.000000000 +0200
-+++ libgcrypt/mpi/longlong.h 2016-08-30 12:56:30.751262074 +0200
-@@ -890,7 +890,7 @@
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+# if defined (__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
- typedef unsigned int UTItype __attribute__ ((mode (TI)));
- # define umul_ppmm(w1, w0, u, v) \
- do { \
=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -1,5 +1,5 @@
# GCRYPT
-GCRYPT_VERSION := 1.7.10
+GCRYPT_VERSION := 1.10.1
GCRYPT_URL := http://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
PKGS += gcrypt
@@ -16,28 +16,16 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
- $(APPLY) $(SRC)/gcrypt/0001-random-Don-t-assume-that-_WIN64-implies-x86_64.patch
- $(APPLY) $(SRC)/gcrypt/0002-aarch64-mpi-Fix-building-the-mpi-aarch64-assembly-fo.patch
$(APPLY) $(SRC)/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch
$(APPLY) $(SRC)/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch
$(APPLY) $(SRC)/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch
-ifdef HAVE_WIN64
- $(APPLY) $(SRC)/gcrypt/64bits-relocation.patch
-endif
-ifeq ($(CC), clang)
-ifeq ($(ARCH),mips64el)
- $(APPLY) $(SRC)/gcrypt/clang-mips64.patch
-endif
-endif
- # Ensure we can compile the assembly code in cipher, for armv7 ios builds
- $(APPLY) $(SRC)/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
$(MOVE)
DEPS_gcrypt = gpg-error $(DEPS_gpg-error)
GCRYPT_CONF = \
- --enable-ciphers=aes,des,rfc2268,arcfour \
- --enable-digests=sha1,md5,rmd160,sha256,sha512 \
+ --enable-ciphers=aes,des,rfc2268,arcfour,chacha20 \
+ --enable-digests=sha1,md5,rmd160,sha256,sha512,blake2 \
--enable-pubkey-ciphers=dsa,rsa,ecc \
--disable-doc
@@ -54,6 +42,9 @@ GCRYPT_CONF += --disable-aesni-support
ifeq ($(ARCH),aarch64)
GCRYPT_CONF += --disable-asm --disable-arm-crypto-support
endif
+ifeq ($(ARCH), x86_64)
+GCRYPT_CONF += ac_cv_sys_symbol_underscore=yes
+endif
else
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
@@ -72,10 +63,6 @@ endif
endif
.gcrypt: gcrypt
- # Reconfiguring this requires a git repo to be available, to
- # successfully produce a nonempty mym4_revision_dec.
- cd $< && git init && git config --local user.email "cone at example.com" && git config --local user.name "Cony Cone" && \
- git commit --allow-empty -m "dummy commit"
$(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(GCRYPT_CONF)
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -20,7 +20,7 @@ default:
variables:
VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20220505170026
- VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20220505172436
+ VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20221011230137
VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20220929111544
VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20220929134817
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20220720135244
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/80a321ad99db3799fa25dc20a770f0af97f43f95...f44d18f7d35c9e87b9631fc938bfc2d420ebfdca
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/80a321ad99db3799fa25dc20a770f0af97f43f95...f44d18f7d35c9e87b9631fc938bfc2d420ebfdca
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list