10 files changed, 79 insertions, 125 deletions

diff --git a/patches/aarch64_crypto_arch.h.patch b/patches/aarch64_crypto_arch.h.patch
new file mode 100644
index 0000000..e6a8cbf
--- /dev/null
+++ b/patches/aarch64_crypto_arch.h.patch
@@ -0,0 +1,16 @@
+--- crypto/arch/aarch64/crypto_arch.h.orig      Sun Jun 29 03:49:56 2025
++++ crypto/arch/aarch64/crypto_arch.h   Sun Jun 29 04:00:13 2025
+@@ -34,11 +34,13 @@ extern uint64_t crypto_cpu_caps_aarch64;
+ #define CRYPTO_CPU_CAPS_AARCH64_SHA3   (1ULL << 5)
+ 
+ #ifndef OPENSSL_NO_ASM
++#if 0
+ 
+ #define HAVE_SHA1_BLOCK_DATA_ORDER
+ #define HAVE_SHA256_BLOCK_DATA_ORDER
+ #define HAVE_SHA512_BLOCK_DATA_ORDER
+ 
++#endif
+ #endif
+ 
+ #endif
diff --git a/patches/amd64_crypto_arch.h.patch b/patches/amd64_crypto_arch.h.patch
new file mode 100644
index 0000000..b094100
--- /dev/null
+++ b/patches/amd64_crypto_arch.h.patch
@@ -0,0 +1,18 @@
+--- crypto/arch/amd64/crypto_arch.h.orig        Wed Jul 23 08:15:02 2025
++++ crypto/arch/amd64/crypto_arch.h     Wed Jul 23 08:15:20 2025
+@@ -47,6 +47,7 @@ extern uint64_t crypto_cpu_caps_amd64;
+ #define HAVE_RC4_INTERNAL
+ #define HAVE_RC4_SET_KEY_INTERNAL
+ 
++#if 0
+ #define HAVE_SHA1_BLOCK_DATA_ORDER
+ #define HAVE_SHA1_BLOCK_GENERIC
+ 
+@@ -55,6 +56,7 @@ extern uint64_t crypto_cpu_caps_amd64;
+ 
+ #define HAVE_SHA512_BLOCK_DATA_ORDER
+ #define HAVE_SHA512_BLOCK_GENERIC
++#endif
+ 
+ #endif
+ 
diff --git a/patches/crypto_arch.h.patch b/patches/crypto_arch.h.patch
deleted file mode 100644
index 6c889e5..0000000
--- a/patches/crypto_arch.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- crypto/arch/amd64/crypto_arch.h.orig        Fri Feb 14 06:00:43 2025
-+++ crypto/arch/amd64/crypto_arch.h     Fri Feb 14 06:01:13 2025
-@@ -40,6 +40,7 @@ extern uint64_t crypto_cpu_caps_amd64;
- #define HAVE_RC4_INTERNAL
- #define HAVE_RC4_SET_KEY_INTERNAL
- 
-+#if 0
- #define HAVE_SHA1_BLOCK_DATA_ORDER
- #define HAVE_SHA1_BLOCK_GENERIC
- 
-@@ -48,6 +49,7 @@ extern uint64_t crypto_cpu_caps_amd64;
- 
- #define HAVE_SHA512_BLOCK_DATA_ORDER
- #define HAVE_SHA512_BLOCK_GENERIC
-+#endif
- 
- #endif
- 
---- crypto/arch/aarch64/crypto_arch.h.orig      Thu Mar 13 05:42:37 2025
-+++ crypto/arch/aarch64/crypto_arch.h   Thu Mar 13 05:47:39 2025
-@@ -33,11 +33,13 @@
- #define CRYPTO_CPU_CAPS_AARCH64_SHA512 (1ULL << 4)
- #define CRYPTO_CPU_CAPS_AARCH64_SHA3   (1ULL << 5)
- 
-+#if 0
- #ifndef OPENSSL_NO_ASM
- 
- #define HAVE_SHA256_BLOCK_DATA_ORDER
- #define HAVE_SHA512_BLOCK_DATA_ORDER
- 
-+#endif
- #endif
- 
- #endif
diff --git a/patches/modes_local.h.patch b/patches/modes_local.h.patch
deleted file mode 100644
index 1ff799b..0000000
--- a/patches/modes_local.h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- crypto/modes/modes_local.h.orig     Sat Jul  8 14:03:53 2023
-+++ crypto/modes/modes_local.h  Sat Jul  8 14:10:56 2023
-@@ -45,6 +45,7 @@
-                        asm ("bswapl %0"                                \
-                        : "+r"(ret));   ret;            })
- # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT)
-+#  if (__ARM_ARCH >= 6)
- #  define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x);                     \
-                        asm ("rev %0,%0; rev %1,%1"                     \
-                        : "+r"(hi),"+r"(lo));                           \
-@@ -53,6 +54,7 @@
-                        asm ("rev %0,%1"                                \
-                        : "=r"(ret) : "r"((u32)(x)));                   \
-                        ret;                            })
-+#  endif
- # endif
- #endif
- #endif
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index 319aca6..345a170 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,5 +1,5 @@
---- apps/nc/netcat.c.orig       Sat Aug 17 03:21:05 2024
-+++ apps/nc/netcat.c    Sat Aug 17 03:28:50 2024
+--- apps/nc/netcat.c.orig       Fri Jun 27 12:39:21 2025
++++ apps/nc/netcat.c    Fri Jun 27 12:39:29 2025
 @@ -93,9 +93,13 @@ int  zflag;                                  /* Port Scan Flag */
  int    Dflag;                                  /* sodebug */
  int    Iflag;                                  /* TCP receive buffer size */
@@ -14,7 +14,7 @@
  
  int    usetls;                                 /* use TLS */
  const char    *Cflag;                          /* Public cert file */
-@@ -268,12 +272,14 @@ main(int argc, char *argv[])
+@@ -271,12 +275,14 @@ main(int argc, char *argv[])
                 case 'u':
                         uflag = 1;
                         break;
@@ -29,7 +29,7 @@
                 case 'v':
                         vflag = 1;
                         break;
-@@ -320,9 +326,11 @@ main(int argc, char *argv[])
+@@ -323,9 +329,11 @@ main(int argc, char *argv[])
                 case 'o':
                         oflag = optarg;
                         break;
@@ -41,7 +41,7 @@
                 case 'T':
                         errstr = NULL;
                         errno = 0;
-@@ -346,9 +354,11 @@ main(int argc, char *argv[])
+@@ -349,9 +357,11 @@ main(int argc, char *argv[])
         argc -= optind;
         argv += optind;
  
@@ -53,7 +53,7 @@
  
         /* Cruft to make sure options are clean, and used properly. */
         if (argc == 1 && family == AF_UNIX) {
-@@ -923,7 +933,10 @@ remote_connect(const char *host, const char *port, str
+@@ -928,7 +938,10 @@ remote_connect(const char *host, const char *port, str
      char *ipaddr)
  {
         struct addrinfo *res, *res0;
@@ -65,7 +65,7 @@
  
         if ((error = getaddrinfo(host, port, &hints, &res0)))
                 errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
-@@ -938,8 +951,10 @@ remote_connect(const char *host, const char *port, str
+@@ -943,8 +956,10 @@ remote_connect(const char *host, const char *port, str
                 if (sflag || pflag) {
                         struct addrinfo ahints, *ares;
  
@@ -76,7 +76,7 @@
                         memset(&ahints, 0, sizeof(struct addrinfo));
                         ahints.ai_family = res->ai_family;
                         ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1031,7 +1046,10 @@ int
+@@ -1036,7 +1051,10 @@ int
  local_listen(const char *host, const char *port, struct addrinfo hints)
  {
         struct addrinfo *res, *res0;
@@ -88,7 +88,7 @@
         int error;
  
         /* Allow nodename to be null. */
-@@ -1052,9 +1070,11 @@ local_listen(const char *host, const char *port, struc
+@@ -1057,9 +1075,11 @@ local_listen(const char *host, const char *port, struc
                     res->ai_protocol)) == -1)
                         continue;
  
@@ -100,7 +100,7 @@
  
                 set_common_sockopts(s, res->ai_family);
  
-@@ -1559,11 +1579,13 @@ set_common_sockopts(int s, int af)
+@@ -1564,11 +1584,13 @@ set_common_sockopts(int s, int af)
  {
         int x = 1;
  
@@ -114,7 +114,7 @@
         if (Dflag) {
                 if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
                     &x, sizeof(x)) == -1)
-@@ -1574,9 +1596,16 @@ set_common_sockopts(int s, int af)
+@@ -1579,9 +1601,16 @@ set_common_sockopts(int s, int af)
                     IP_TOS, &Tflag, sizeof(Tflag)) == -1)
                         err(1, "set IP ToS");
  
@@ -131,7 +131,7 @@
         }
         if (Iflag) {
                 if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1600,13 +1629,17 @@ set_common_sockopts(int s, int af)
+@@ -1605,13 +1634,17 @@ set_common_sockopts(int s, int af)
         }
  
         if (minttl != -1) {
@@ -150,7 +150,7 @@
         }
  }
  
-@@ -1831,15 +1864,19 @@ help(void)
+@@ -1841,15 +1874,19 @@ help(void)
         \t-P proxyuser\tUsername for proxy authentication\n\
         \t-p port\t     Specify local port for remote connects\n\
         \t-R CAfile     CA bundle\n\
@@ -175,4 +175,4 @@
 +       "\t-v           Verbose\n\
         \t-W recvlimit  Terminate after receiving a number of packets\n\
         \t-w timeout    Timeout for connects and final net reads\n\
-        \t-X proto      Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
+        \t-X proto      Proxy protocol: \"4\", \"4A\", \"5\" (SOCKS) or \"connect\"\n\
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index 5ba5ac6..60ea9a7 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
---- apps/openssl/openssl.c.orig Thu Jan  2 08:27:54 2025
-+++ apps/openssl/openssl.c      Thu Jan  2 08:28:04 2025
-@@ -344,7 +344,9 @@ BIO *bio_err = NULL;
+--- apps/openssl/openssl.c.orig Sat May 31 03:18:05 2025
++++ apps/openssl/openssl.c      Sat May 31 03:18:17 2025
+@@ -341,7 +341,9 @@ BIO *bio_err = NULL;
  static void
  openssl_startup(void)
  {
diff --git a/patches/opensslfeatures.h.patch b/patches/opensslfeatures.h.patch
index 77df5dc..d370b32 100644
--- a/patches/opensslfeatures.h.patch
+++ b/patches/opensslfeatures.h.patch
@@ -36,3 +36,14 @@
  #include "bytestring.h"
  
  #if defined(__cplusplus)
+--- tests/test.h.orig   Sat May 31 04:48:09 2025
++++ tests/test.h        Sat May 31 04:48:31 2025
+@@ -18,6 +18,8 @@
+ #ifndef HEADER_TEST_H
+ #define HEADER_TEST_H
+ 
++#include <openssl/opensslfeatures.h>
++
+ #include <stddef.h>
+ #include <stdint.h>
+ 
diff --git a/patches/patch-aarch64-crypto-cpu-caps.c.patch b/patches/patch-aarch64-crypto-cpu-caps.c.patch
deleted file mode 100644
index dcfbdc0..0000000
--- a/patches/patch-aarch64-crypto-cpu-caps.c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Disable feature detection until we find a more portable way.
-
---- crypto/arch/aarch64/crypto_cpu_caps.c.orig  Sat Dec 14 13:45:16 2024
-+++ crypto/arch/aarch64/crypto_cpu_caps.c       Sat Dec 14 13:54:06 2024
-@@ -16,9 +16,12 @@
-  */
- 
- #include <sys/types.h>
-+
-+#if defined(__OpenBSD__)
- #include <sys/sysctl.h>
- 
- #include <machine/cpu.h>
-+#endif
- 
- #include <stddef.h>
- #include <stdio.h>
-@@ -67,6 +70,7 @@ parse_isar0(uint64_t isar0)
-        return caps;
- }
- 
-+#if defined(__OpenBSD__)
- static int
- read_isar0(uint64_t *isar0)
- {
-@@ -84,6 +88,13 @@ read_isar0(uint64_t *isar0)
- 
-        return 1;
- }
-+#else
-+static int
-+read_isar0(uint64_t *isar0)
-+{
-+       return 0;
-+}
-+#endif
- 
- void
- crypto_cpu_caps_init(void)
diff --git a/patches/patch-i386-crypto-cpu-caps.c.patch b/patches/patch-i386-crypto-cpu-caps.c.patch
index c85e33c..0642582 100644
--- a/patches/patch-i386-crypto-cpu-caps.c.patch
+++ b/patches/patch-i386-crypto-cpu-caps.c.patch
@@ -1,6 +1,6 @@
---- crypto/arch/i386/crypto_cpu_caps.c.orig     Fri Oct 18 17:35:20 2024
-+++ crypto/arch/i386/crypto_cpu_caps.c  Fri Oct 18 17:39:13 2024
-@@ -33,7 +33,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e
+--- crypto/arch/i386/crypto_cpu_caps.c.orig     Mon Jun 16 10:38:27 2025
++++ crypto/arch/i386/crypto_cpu_caps.c  Mon Jun 16 10:38:39 2025
+@@ -37,7 +37,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e
  {
         uint32_t ebx = 0, ecx = 0, edx = 0;
  
@@ -9,7 +9,7 @@
         __asm__ ("cpuid": "+a"(eax), "+b"(ebx), "+c"(ecx), "+d"(edx));
  #else
         eax = 0;
-@@ -54,7 +54,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_
+@@ -58,7 +58,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_
  {
         uint32_t eax = 0, edx = 0;
  
diff --git a/patches/speed.c.patch b/patches/speed.c.patch
index e1f1698..32e42b4 100644
--- a/patches/speed.c.patch
+++ b/patches/speed.c.patch
@@ -1,6 +1,6 @@
---- apps/openssl/speed.c.orig   Thu Jan  2 08:04:28 2025
-+++ apps/openssl/speed.c        Thu Jan  2 08:04:38 2025
-@@ -158,7 +158,16 @@ static void
+--- apps/openssl/speed.c.orig   Sat May 31 03:18:05 2025
++++ apps/openssl/speed.c        Sat May 31 03:18:17 2025
+@@ -154,7 +154,16 @@ static void
  pkey_print_message(const char *str, const char *str2,
      long num, int bits, int sec);
  static void print_result(int alg, int run_no, int count, double time_used);
@@ -15,9 +15,9 @@
 +#define alarm(seconds)         speed_alarm((seconds))
 +#endif
  
- #define ALGOR_NUM      32
+ #define ALGOR_NUM      31
  #define SIZE_NUM       5
-@@ -1129,8 +1138,10 @@ speed_main(int argc, char **argv)
+@@ -1087,8 +1096,10 @@ speed_main(int argc, char **argv)
         const EVP_CIPHER *evp_cipher = NULL;
         const EVP_MD *evp_md = NULL;
         int decrypt = 0;
@@ -28,7 +28,7 @@
         const char *errstr = NULL;
  
         if (pledge("stdio proc", NULL) == -1) {
-@@ -1205,6 +1216,7 @@ speed_main(int argc, char **argv)
+@@ -1163,6 +1174,7 @@ speed_main(int argc, char **argv)
                         decrypt = 1;
                         j--;    /* Otherwise, -decrypt gets confused with an
                                  * algorithm. */
@@ -36,7 +36,7 @@
                 } else if (argc > 0 && strcmp(*argv, "-multi") == 0) {
                         argc--;
                         argv++;
-@@ -1219,6 +1231,7 @@ speed_main(int argc, char **argv)
+@@ -1177,6 +1189,7 @@ speed_main(int argc, char **argv)
                         }
                         j--;    /* Otherwise, -multi gets confused with an
                                  * algorithm. */
@@ -44,7 +44,7 @@
                 } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) {
                         argc--;
                         argv++;
-@@ -1542,7 +1555,9 @@ speed_main(int argc, char **argv)
+@@ -1491,7 +1504,9 @@ speed_main(int argc, char **argv)
                         BIO_printf(bio_err, "-evp e          use EVP e.\n");
                         BIO_printf(bio_err, "-decrypt        time decryption instead of encryption (only EVP).\n");
                         BIO_printf(bio_err, "-mr             produce machine readable output.\n");
@@ -54,7 +54,7 @@
                         BIO_printf(bio_err, "-unaligned n    use buffers with offset n from proper alignment.\n");
                         goto end;
                 }
-@@ -1551,8 +1566,10 @@ speed_main(int argc, char **argv)
+@@ -1500,8 +1515,10 @@ speed_main(int argc, char **argv)
                 j++;
         }
  
@@ -65,7 +65,7 @@
  
         if (j == 0) {
                 for (i = 0; i < ALGOR_NUM; i++) {
-@@ -1624,11 +1641,13 @@ speed_main(int argc, char **argv)
+@@ -1573,11 +1590,13 @@ speed_main(int argc, char **argv)
  #define COND(c)        (run && count<0x7fffffff)
  #define COUNT(d) (count)
  
@@ -79,7 +79,7 @@
  
  #ifndef OPENSSL_NO_MD4
         if (doit[D_MD4]) {
-@@ -2434,7 +2453,9 @@ speed_main(int argc, char **argv)
+@@ -2370,7 +2389,9 @@ speed_main(int argc, char **argv)
                                 ecdh_doit[j] = 0;
                 }
         }
@@ -89,7 +89,7 @@
         if (!mr) {
                 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION));
                 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-@@ -2590,11 +2611,15 @@ pkey_print_message(const char *str, const char *str2, 
+@@ -2526,11 +2547,15 @@ pkey_print_message(const char *str, const char *str2, 
  static void
  print_result(int alg, int run_no, int count, double time_used)
  {
@@ -105,7 +105,7 @@
  static char *
  sstrsep(char **string, const char *delim)
  {
-@@ -2795,5 +2820,6 @@ do_multi(int multi)
+@@ -2731,5 +2756,6 @@ do_multi(int multi)
         free(fds);
         return 1;
  }