Update 20 packages

libxml2 (2.12.7-1 -> 2.13.0-1) mingw-w64-i686-asciidoctor (new: 2.0.23-1) mingw-w64-i686-asciidoctor-extensions (removed) mingw-w64-i686-crt-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-i686-headers-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-i686-libmangle-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-i686-libwinpthread-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-i686-nettle (3.9.1-1 -> 3.10-1) mingw-w64-i686-tools-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-i686-winpthreads-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-asciidoctor (new: 2.0.23-1) mingw-w64-x86_64-asciidoctor-extensions (removed) mingw-w64-x86_64-crt-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-headers-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-libmangle-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-libwinpthread-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-nettle (3.9.1-1 -> 3.10-1) mingw-w64-x86_64-tools-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) mingw-w64-x86_64-winpthreads-git (12.0.0.r32.gf977e1c38-1 -> 12.0.0.r81.g90abf784a-1) perl-Module-Build (0.4231-2 -> 0.4234-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Jun 18, 2024 · e4057ff · e4057ff
1 parent 2367fb7
commit e4057ff
Show file tree

Hide file tree

Showing 2,843 changed files with 6,067 additions and 20,198 deletions.
diff --git a/mingw32/bin/asciidoctor b/mingw32/bin/asciidoctor
@@ -5,7 +5,7 @@ _=_\
 bindir="${0%/*}"
 exec "$bindir/ruby" "-x" "$0" "$@"
 =end
-#!D:/a/git-sdk-64/git-sdk-64/mingw32/bin/ruby.exe
+#!/mingw32/bin/ruby
 #
 # This file was generated by RubyGems.
 #

diff --git a/mingw32/bin/gendef.exe b/mingw32/bin/gendef.exe
diff --git a/mingw32/bin/genidl.exe b/mingw32/bin/genidl.exe
diff --git a/mingw32/bin/genpeimg.exe b/mingw32/bin/genpeimg.exe
diff --git a/mingw32/bin/libhogweed-6.dll b/mingw32/bin/libhogweed-6.dll
diff --git a/mingw32/bin/libnettle-8.dll b/mingw32/bin/libnettle-8.dll
diff --git a/mingw32/bin/libwinpthread-1.dll b/mingw32/bin/libwinpthread-1.dll
diff --git a/mingw32/bin/nettle-hash.exe b/mingw32/bin/nettle-hash.exe
diff --git a/mingw32/bin/nettle-lfib-stream.exe b/mingw32/bin/nettle-lfib-stream.exe
diff --git a/mingw32/bin/nettle-pbkdf2.exe b/mingw32/bin/nettle-pbkdf2.exe
diff --git a/mingw32/bin/pkcs1-conv.exe b/mingw32/bin/pkcs1-conv.exe
diff --git a/mingw32/bin/sexp-conv.exe b/mingw32/bin/sexp-conv.exe
diff --git a/mingw32/bin/widl.exe b/mingw32/bin/widl.exe
diff --git a/mingw32/include/ctype.h b/mingw32/include/ctype.h
@@ -22,28 +22,11 @@ extern "C" {
 
 #ifndef __PCTYPE_FUNC
 #define __PCTYPE_FUNC __pctype_func()
-#ifdef _MSVCRT_
-#define __pctype_func()	(_pctype)
-#else
-#ifdef _UCRT
-  _CRTIMP unsigned short* __pctype_func(void);
-#else
-#define __pctype_func()	(* __MINGW_IMP_SYMBOL(_pctype))
-#endif
-#endif
+  _CRTIMP const unsigned short* __pctype_func(void);
 #endif
 
 #ifndef _pctype
-#ifdef _MSVCRT_
-  extern unsigned short *_pctype;
-#else
-#ifdef _UCRT
 #define _pctype (__pctype_func())
-#else
-  extern unsigned short ** __MINGW_IMP_SYMBOL(_pctype);
-#define _pctype (* __MINGW_IMP_SYMBOL(_pctype))
-#endif
-#endif
 #endif
 
 #endif
@@ -53,24 +36,13 @@ extern "C" {
 #define _CRT_WCTYPEDATA_DEFINED
 #ifndef _CTYPE_DISABLE_MACROS
 #if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
-#ifdef _MSVCRT_
-  extern unsigned short *_wctype;
-#else
-  extern unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
+  extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
 #define _wctype (* __MINGW_IMP_SYMBOL(_wctype))
 #endif
-#endif
-#ifdef _MSVCRT_
-#define __pwctype_func() (_pwctype)
-#ifndef _pwctype
-  extern unsigned short *_pwctype;
-#endif
-#else
-#define __pwctype_func() (* __MINGW_IMP_SYMBOL(_pwctype))
+
+  _CRTIMP const wctype_t * __cdecl __pwctype_func(void);
 #ifndef _pwctype
-  extern unsigned short ** __MINGW_IMP_SYMBOL(_pwctype);
-#define _pwctype (* __MINGW_IMP_SYMBOL(_pwctype))
-#endif
+#define _pwctype (__pwctype_func())
 #endif
 #endif
 #endif
@@ -201,16 +173,8 @@ int __cdecl iswblank(wint_t _C);
 #ifndef MB_CUR_MAX
 #define MB_CUR_MAX ___mb_cur_max_func()
 #ifndef __mb_cur_max
-#ifdef _MSVCRT_
-  extern int __mb_cur_max;
-#define __mb_cur_max	__mb_cur_max
-#else
-#ifndef _UCRT
-  extern int * __MINGW_IMP_SYMBOL(__mb_cur_max);
-#endif
 #define __mb_cur_max	(___mb_cur_max_func())
 #endif
-#endif
 _CRTIMP int __cdecl ___mb_cur_max_func(void);
 #endif
 

diff --git a/mingw32/include/math.h b/mingw32/include/math.h
@@ -52,7 +52,6 @@ struct _exception;
 #define M_SQRT1_2	0.70710678118654752440
 #endif
 
-#ifndef __STRICT_ANSI__
 /* See also float.h  */
 #ifndef __MINGW_FPCLASS_DEFINED
 #define __MINGW_FPCLASS_DEFINED 1
@@ -68,7 +67,6 @@ struct _exception;
 #define	_FPCLASS_PN	0x0100	/* Positive Normal */
 #define	_FPCLASS_PINF	0x0200	/* Positive Infinity */
 #endif
-#endif
 
 #ifndef RC_INVOKED
 
@@ -258,8 +256,6 @@ extern "C" {
 #define EDOM 33
 #define ERANGE 34
 
-#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
 #ifndef _COMPLEX_DEFINED
 #define _COMPLEX_DEFINED
   struct _complex {
@@ -301,7 +297,7 @@ extern "C" {
 
 /* END FLOAT.H COPY */
 
-#if !defined(NO_OLDNAMES)
+#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 _CRTIMP double __cdecl j0 (double) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
 _CRTIMP double __cdecl j1 (double) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
@@ -310,6 +306,8 @@ _CRTIMP double __cdecl y0 (double) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
 _CRTIMP double __cdecl y1 (double) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
 _CRTIMP double __cdecl yn (int, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
 
+#if !defined(NO_OLDNAMES)
+
 _CRTIMP double __cdecl chgsign (double);
 /*
  * scalb() is a GCC built-in.
@@ -333,14 +331,13 @@ _CRTIMP double __cdecl scalb (double, long);
 #define FP_NNORM   _FPCLASS_NN
 #define FP_PNORM   _FPCLASS_PN
 
-#endif /* !defined (_NO_OLDNAMES) && !define (NO_OLDNAMES) */
+#endif /* !define (NO_OLDNAMES) */
+#endif
 
 #if(defined(_X86_) && !defined(__x86_64))
   _CRTIMP int __cdecl _set_SSE2_enable(int _Flag);
 #endif
 
-#endif
-
 #ifndef __NO_ISOCEXT
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
 	|| !defined __STRICT_ANSI__ || defined __cplusplus

diff --git a/mingw32/include/mbctype.h b/mingw32/include/mbctype.h
@@ -14,20 +14,13 @@ extern "C" {
 #endif
 
 #ifndef _mbctype
-#ifdef _MSVCRT_
-  extern unsigned char _mbctype[257];
-#else
-  extern unsigned char ** __MINGW_IMP_SYMBOL(_mbctype);
-#define _mbctype (* __MINGW_IMP_SYMBOL(_mbctype))
-#endif
+  _CRTIMP unsigned char * __cdecl __p__mbctype(void);
+#define _mbctype (__p__mbctype())
 #endif
+
 #ifndef _mbcasemap
-#ifdef _MSVCRT_
-  extern unsigned char *_mbcasemap;
-#else
-  extern unsigned char ** __MINGW_IMP_SYMBOL(_mbcasemap);
-#define _mbcasemap (* __MINGW_IMP_SYMBOL(_mbcasemap))
-#endif
+  _CRTIMP unsigned char * __cdecl __p__mbcasemap(void);
+#define _mbcasemap (__p__mbcasemap())
 #endif
 
   extern pthreadmbcinfo __ptmbcinfo;

diff --git a/mingw32/include/nettle/drbg-ctr.h b/mingw32/include/nettle/drbg-ctr.h
@@ -0,0 +1,69 @@
+/* drbg-ctr.h
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle 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
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef NETTLE_DRBG_CTR_H_INCLUDED
+#define NETTLE_DRBG_CTR_H_INCLUDED
+
+#include "nettle-types.h"
+
+#include "aes.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Namespace mangling */
+#define drbg_ctr_aes256_init nettle_drbg_ctr_aes256_init
+#define drbg_ctr_aes256_random nettle_drbg_ctr_aes256_random
+
+#define DRBG_CTR_AES256_SEED_SIZE (AES_BLOCK_SIZE + AES256_KEY_SIZE)
+
+struct drbg_ctr_aes256_ctx
+{
+  struct aes256_ctx key;
+  union nettle_block16 V;
+};
+
+/* Initialize using DRBG_CTR_AES256_SEED_SIZE bytes of
+   SEED_MATERIAL.  */
+void
+drbg_ctr_aes256_init (struct drbg_ctr_aes256_ctx *ctx,
+		      uint8_t *seed_material);
+
+/* Output N bytes of random data into DST.  */
+void
+drbg_ctr_aes256_random (struct drbg_ctr_aes256_ctx *ctx,
+			size_t n, uint8_t *dst);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NETTLE_DRBG_CTR_H_INCLUDED */
diff --git a/mingw32/include/nettle/macros.h b/mingw32/include/nettle/macros.h
@@ -180,6 +180,7 @@ do {						\
    length and data. */
 #define MD_UPDATE(ctx, length, data, f, incr)				\
   do {									\
+    if (!length) goto __md_done;					\
     if ((ctx)->index)							\
       {									\
 	/* Try to fill partial block */					\

diff --git a/mingw32/include/nettle/rsa.h b/mingw32/include/nettle/rsa.h
@@ -88,6 +88,12 @@ extern "C" {
 #define rsa_encrypt nettle_rsa_encrypt
 #define rsa_decrypt nettle_rsa_decrypt
 #define rsa_decrypt_tr nettle_rsa_decrypt_tr
+#define rsa_oaep_sha256_encrypt nettle_rsa_oaep_sha256_encrypt
+#define rsa_oaep_sha256_decrypt nettle_rsa_oaep_sha256_decrypt
+#define rsa_oaep_sha384_encrypt nettle_rsa_oaep_sha384_encrypt
+#define rsa_oaep_sha384_decrypt nettle_rsa_oaep_sha384_decrypt
+#define rsa_oaep_sha512_encrypt nettle_rsa_oaep_sha512_encrypt
+#define rsa_oaep_sha512_decrypt nettle_rsa_oaep_sha512_decrypt
 #define rsa_sec_decrypt nettle_rsa_sec_decrypt
 #define rsa_compute_root nettle_rsa_compute_root
 #define rsa_compute_root_tr nettle_rsa_compute_root_tr
@@ -389,8 +395,6 @@ rsa_pss_sha512_verify_digest(const struct rsa_public_key *key,
 
 
 /* RSA encryption, using PKCS#1 */
-/* These functions uses the v1.5 padding. What should the v2 (OAEP)
- * functions be called? */
 
 /* Returns 1 on success, 0 on failure, which happens if the
  * message is too long for the key. */
@@ -428,6 +432,53 @@ rsa_sec_decrypt(const struct rsa_public_key *pub,
 	        size_t length, uint8_t *message,
 	        const mpz_t gibberish);
 
+/* RSA encryption, using OAEP */
+
+int
+rsa_oaep_sha256_encrypt (const struct rsa_public_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t length, const uint8_t * message,
+			 uint8_t *ciphertext);
+
+int
+rsa_oaep_sha256_decrypt (const struct rsa_public_key *pub,
+			 const struct rsa_private_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t *length, uint8_t *message,
+			 const uint8_t *ciphertext);
+
+int
+rsa_oaep_sha384_encrypt (const struct rsa_public_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t length, const uint8_t * message,
+			 uint8_t *ciphertext);
+
+int
+rsa_oaep_sha384_decrypt (const struct rsa_public_key *pub,
+			 const struct rsa_private_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t *length, uint8_t *message,
+			 const uint8_t *ciphertext);
+
+int
+rsa_oaep_sha512_encrypt (const struct rsa_public_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t length, const uint8_t *message,
+			 uint8_t *ciphertext);
+
+int
+rsa_oaep_sha512_decrypt (const struct rsa_public_key *pub,
+			 const struct rsa_private_key *key,
+			 void *random_ctx, nettle_random_func *random,
+			 size_t label_length, const uint8_t *label,
+			 size_t *length, uint8_t *message,
+			 const uint8_t *ciphertext);
+
 /* Compute x, the e:th root of m. Calling it with x == m is allowed.
    It is required that 0 <= m < n. */
 void

diff --git a/mingw32/include/nettle/sha3.h b/mingw32/include/nettle/sha3.h
@@ -42,13 +42,18 @@ extern "C" {
 
 /* Name mangling */
 #define sha3_permute nettle_sha3_permute
+#define sha3_128_init nettle_sha3_128_init
+#define sha3_128_update nettle_sha3_128_update
+#define sha3_128_shake nettle_sha3_128_shake
+#define sha3_128_shake_output nettle_sha3_128_shake_output
 #define sha3_224_init nettle_sha3_224_init
 #define sha3_224_update nettle_sha3_224_update
 #define sha3_224_digest nettle_sha3_224_digest
 #define sha3_256_init nettle_sha3_256_init
 #define sha3_256_update nettle_sha3_256_update
 #define sha3_256_digest nettle_sha3_256_digest
 #define sha3_256_shake nettle_sha3_256_shake
+#define sha3_256_shake_output nettle_sha3_256_shake_output
 #define sha3_384_init nettle_sha3_384_init
 #define sha3_384_update nettle_sha3_384_update
 #define sha3_384_digest nettle_sha3_384_digest
@@ -78,6 +83,9 @@ sha3_permute (struct sha3_state *state);
    The "rate" is the width - capacity, or width - 2 * (digest
    size). */
 
+#define SHA3_128_DIGEST_SIZE 16
+#define SHA3_128_BLOCK_SIZE 168
+
 #define SHA3_224_DIGEST_SIZE 28
 #define SHA3_224_BLOCK_SIZE 144
 
@@ -96,6 +104,31 @@ sha3_permute (struct sha3_state *state);
 #define SHA3_384_DATA_SIZE SHA3_384_BLOCK_SIZE
 #define SHA3_512_DATA_SIZE SHA3_512_BLOCK_SIZE
 
+struct sha3_128_ctx
+{
+  struct sha3_state state;
+  unsigned index;
+  uint8_t block[SHA3_128_BLOCK_SIZE];
+};
+
+void
+sha3_128_init (struct sha3_128_ctx *ctx);
+
+void
+sha3_128_update (struct sha3_128_ctx *ctx,
+		 size_t length,
+		 const uint8_t *data);
+
+void
+sha3_128_shake (struct sha3_128_ctx *ctx,
+		size_t length,
+		uint8_t *digest);
+
+void
+sha3_128_shake_output (struct sha3_128_ctx *ctx,
+		       size_t length,
+		       uint8_t *digest);
+
 struct sha3_224_ctx
 {
   struct sha3_state state;
@@ -143,6 +176,13 @@ sha3_256_shake(struct sha3_256_ctx *ctx,
 	       size_t length,
 	       uint8_t *digest);
 
+/* Unlike sha3_256_shake, this function can be called multiple times
+   to retrieve output from shake256 in an incremental manner */
+void
+sha3_256_shake_output(struct sha3_256_ctx *ctx,
+		      size_t length,
+		      uint8_t *digest);
+
 struct sha3_384_ctx
 {
   struct sha3_state state;