diff options
| author | Theo Buehler <tb@openbsd.org> | 2025-10-24 07:08:15 -0600 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2025-10-24 07:12:24 -0600 |
| commit | 4d719d6ce3b0f664191fbe6ab5fd40142d3bdec4 (patch) | |
| tree | 50014fe5cc2b28cc2d3ae37253f297e5e6cfa631 | |
| parent | 1e86f9cf57855d06ecd2383c3ffe9325f57852ea (diff) | |
| download | portable-4d719d6ce3b0f664191fbe6ab5fd40142d3bdec4.tar.gz portable-4d719d6ce3b0f664191fbe6ab5fd40142d3bdec4.tar.bz2 portable-4d719d6ce3b0f664191fbe6ab5fd40142d3bdec4.zip | |
regen patches
| -rw-r--r-- | patches/amd64_crypto_arch.h.patch | 8 | ||||
| -rw-r--r-- | patches/mlkem_internal.h.patch | 6 | ||||
| -rw-r--r-- | patches/netcat.c.patch | 12 | ||||
| -rw-r--r-- | patches/win32_amd64_bn_arch.h.patch | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/patches/amd64_crypto_arch.h.patch b/patches/amd64_crypto_arch.h.patch index bf44458..e31f988 100644 --- a/patches/amd64_crypto_arch.h.patch +++ b/patches/amd64_crypto_arch.h.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | --- crypto/arch/amd64/crypto_arch.h.orig Sun Aug 17 13:14:19 2025 | 1 | --- crypto/arch/amd64/crypto_arch.h.orig Fri Oct 24 07:06:10 2025 |
| 2 | +++ crypto/arch/amd64/crypto_arch.h Sun Aug 24 23:47:56 2025 | 2 | +++ crypto/arch/amd64/crypto_arch.h Fri Oct 24 07:06:21 2025 |
| 3 | @@ -48,6 +48,7 @@ extern uint64_t crypto_cpu_caps_amd64; | 3 | @@ -53,6 +53,7 @@ extern uint64_t crypto_cpu_caps_amd64; |
| 4 | #define HAVE_RC4_INTERNAL | 4 | #define HAVE_RC4_INTERNAL |
| 5 | #define HAVE_RC4_SET_KEY_INTERNAL | 5 | #define HAVE_RC4_SET_KEY_INTERNAL |
| 6 | 6 | ||
| @@ -8,7 +8,7 @@ | |||
| 8 | #define HAVE_SHA1_BLOCK_DATA_ORDER | 8 | #define HAVE_SHA1_BLOCK_DATA_ORDER |
| 9 | #define HAVE_SHA1_BLOCK_GENERIC | 9 | #define HAVE_SHA1_BLOCK_GENERIC |
| 10 | 10 | ||
| 11 | @@ -56,6 +57,7 @@ extern uint64_t crypto_cpu_caps_amd64; | 11 | @@ -61,6 +62,7 @@ extern uint64_t crypto_cpu_caps_amd64; |
| 12 | 12 | ||
| 13 | #define HAVE_SHA512_BLOCK_DATA_ORDER | 13 | #define HAVE_SHA512_BLOCK_DATA_ORDER |
| 14 | #define HAVE_SHA512_BLOCK_GENERIC | 14 | #define HAVE_SHA512_BLOCK_GENERIC |
diff --git a/patches/mlkem_internal.h.patch b/patches/mlkem_internal.h.patch index b7cbdcf..ee25521 100644 --- a/patches/mlkem_internal.h.patch +++ b/patches/mlkem_internal.h.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | --- crypto/mlkem/mlkem_internal.h.orig Sun Aug 17 13:20:18 2025 | 1 | --- crypto/mlkem/mlkem_internal.h.orig Fri Oct 24 07:06:10 2025 |
| 2 | +++ crypto/mlkem/mlkem_internal.h Sun Aug 17 13:20:37 2025 | 2 | +++ crypto/mlkem/mlkem_internal.h Fri Oct 24 07:06:22 2025 |
| 3 | @@ -19,7 +19,7 @@ | 3 | @@ -20,7 +20,7 @@ |
| 4 | #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H | 4 | #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H |
| 5 | 5 | ||
| 6 | #include "bytestring.h" | 6 | #include "bytestring.h" |
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch index 345a170..c6b9f68 100644 --- a/patches/netcat.c.patch +++ b/patches/netcat.c.patch | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | --- apps/nc/netcat.c.orig Fri Jun 27 12:39:21 2025 | 1 | --- apps/nc/netcat.c.orig Fri Oct 24 07:06:13 2025 |
| 2 | +++ apps/nc/netcat.c Fri Jun 27 12:39:29 2025 | 2 | +++ apps/nc/netcat.c Fri Oct 24 07:06:22 2025 |
| 3 | @@ -93,9 +93,13 @@ int zflag; /* Port Scan Flag */ | 3 | @@ -93,9 +93,13 @@ int zflag; /* Port Scan Flag */ |
| 4 | int Dflag; /* sodebug */ | 4 | int Dflag; /* sodebug */ |
| 5 | int Iflag; /* TCP receive buffer size */ | 5 | int Iflag; /* TCP receive buffer size */ |
| @@ -100,7 +100,7 @@ | |||
| 100 | 100 | ||
| 101 | set_common_sockopts(s, res->ai_family); | 101 | set_common_sockopts(s, res->ai_family); |
| 102 | 102 | ||
| 103 | @@ -1564,11 +1584,13 @@ set_common_sockopts(int s, int af) | 103 | @@ -1569,11 +1589,13 @@ set_common_sockopts(int s, int af) |
| 104 | { | 104 | { |
| 105 | int x = 1; | 105 | int x = 1; |
| 106 | 106 | ||
| @@ -114,7 +114,7 @@ | |||
| 114 | if (Dflag) { | 114 | if (Dflag) { |
| 115 | if (setsockopt(s, SOL_SOCKET, SO_DEBUG, | 115 | if (setsockopt(s, SOL_SOCKET, SO_DEBUG, |
| 116 | &x, sizeof(x)) == -1) | 116 | &x, sizeof(x)) == -1) |
| 117 | @@ -1579,9 +1601,16 @@ set_common_sockopts(int s, int af) | 117 | @@ -1584,9 +1606,16 @@ set_common_sockopts(int s, int af) |
| 118 | IP_TOS, &Tflag, sizeof(Tflag)) == -1) | 118 | IP_TOS, &Tflag, sizeof(Tflag)) == -1) |
| 119 | err(1, "set IP ToS"); | 119 | err(1, "set IP ToS"); |
| 120 | 120 | ||
| @@ -131,7 +131,7 @@ | |||
| 131 | } | 131 | } |
| 132 | if (Iflag) { | 132 | if (Iflag) { |
| 133 | if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, | 133 | if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, |
| 134 | @@ -1605,13 +1634,17 @@ set_common_sockopts(int s, int af) | 134 | @@ -1610,13 +1639,17 @@ set_common_sockopts(int s, int af) |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | if (minttl != -1) { | 137 | if (minttl != -1) { |
| @@ -150,7 +150,7 @@ | |||
| 150 | } | 150 | } |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | @@ -1841,15 +1874,19 @@ help(void) | 153 | @@ -1846,15 +1879,19 @@ help(void) |
| 154 | \t-P proxyuser\tUsername for proxy authentication\n\ | 154 | \t-P proxyuser\tUsername for proxy authentication\n\ |
| 155 | \t-p port\t Specify local port for remote connects\n\ | 155 | \t-p port\t Specify local port for remote connects\n\ |
| 156 | \t-R CAfile CA bundle\n\ | 156 | \t-R CAfile CA bundle\n\ |
diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch index baa82f8..a6a5ee9 100644 --- a/patches/win32_amd64_bn_arch.h.patch +++ b/patches/win32_amd64_bn_arch.h.patch | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | We should consider a OPENSSL_NO_BN_ASM if we can't figure | 1 | We should consider a OPENSSL_NO_BN_ASM if we can't figure |
| 2 | out how to fix BIGNUM on this OS | 2 | out how to fix BIGNUM on this OS |
| 3 | 3 | ||
| 4 | --- crypto/bn/arch/amd64/bn_arch.h.orig Sun Aug 17 13:14:19 2025 | 4 | --- crypto/bn/arch/amd64/bn_arch.h.orig Fri Oct 24 07:06:10 2025 |
| 5 | +++ crypto/bn/arch/amd64/bn_arch.h Sun Aug 24 23:47:56 2025 | 5 | +++ crypto/bn/arch/amd64/bn_arch.h Fri Oct 24 07:06:22 2025 |
| 6 | @@ -20,8 +20,14 @@ | 6 | @@ -20,8 +20,14 @@ |
| 7 | #ifndef HEADER_BN_ARCH_H | 7 | #ifndef HEADER_BN_ARCH_H |
| 8 | #define HEADER_BN_ARCH_H | 8 | #define HEADER_BN_ARCH_H |
| @@ -18,7 +18,7 @@ out how to fix BIGNUM on this OS | |||
| 18 | #define HAVE_BN_ADD | 18 | #define HAVE_BN_ADD |
| 19 | #define HAVE_BN_ADD_WORDS | 19 | #define HAVE_BN_ADD_WORDS |
| 20 | 20 | ||
| 21 | @@ -109,6 +115,7 @@ bn_subw(BN_ULONG a, BN_ULONG b, BN_ULONG *out_borrow, | 21 | @@ -110,6 +116,7 @@ bn_subw(BN_ULONG a, BN_ULONG b, BN_ULONG *out_borrow, |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | #endif /* __GNUC__ */ | 24 | #endif /* __GNUC__ */ |
