uringmachine 0.16 → 0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/FUNDING.yml +3 -0
- data/.gitmodules +4 -0
- data/CHANGELOG.md +8 -0
- data/TODO.md +12 -3
- data/examples/bm_send.rb +86 -0
- data/ext/um/um.c +28 -1
- data/ext/um/um.h +3 -0
- data/ext/um/um_class.c +17 -0
- data/ext/um/um_utils.c +38 -15
- data/lib/uringmachine/version.rb +1 -1
- data/test/test_um.rb +76 -0
- data/vendor/libressl/.github/scripts/changelog.sh +74 -0
- data/vendor/libressl/.github/workflows/android.yml +35 -0
- data/vendor/libressl/.github/workflows/cifuzz.yml +33 -0
- data/vendor/libressl/.github/workflows/cmake-config.yml +98 -0
- data/vendor/libressl/.github/workflows/coverity.yml +69 -0
- data/vendor/libressl/.github/workflows/emscripten.yml +71 -0
- data/vendor/libressl/.github/workflows/fedora-rawhide.yml +39 -0
- data/vendor/libressl/.github/workflows/freebsd.yml +71 -0
- data/vendor/libressl/.github/workflows/linux.yml +71 -0
- data/vendor/libressl/.github/workflows/macos.yml +37 -0
- data/vendor/libressl/.github/workflows/release.yml +81 -0
- data/vendor/libressl/.github/workflows/rust-openssl.yml +47 -0
- data/vendor/libressl/.github/workflows/solaris.yml +37 -0
- data/vendor/libressl/.github/workflows/windows.yml +70 -0
- data/vendor/libressl/.gitignore +333 -0
- data/vendor/libressl/CMakeLists.txt +581 -0
- data/vendor/libressl/COPYING +133 -0
- data/vendor/libressl/ChangeLog +3280 -0
- data/vendor/libressl/FindLibreSSL.cmake +232 -0
- data/vendor/libressl/LibreSSLConfig.cmake.in +36 -0
- data/vendor/libressl/Makefile.am +60 -0
- data/vendor/libressl/Makefile.am.common +20 -0
- data/vendor/libressl/OPENBSD_BRANCH +1 -0
- data/vendor/libressl/README.md +238 -0
- data/vendor/libressl/README.mingw.md +43 -0
- data/vendor/libressl/apps/CMakeLists.txt +18 -0
- data/vendor/libressl/apps/Makefile.am +5 -0
- data/vendor/libressl/apps/nc/CMakeLists.txt +67 -0
- data/vendor/libressl/apps/nc/Makefile.am +64 -0
- data/vendor/libressl/apps/nc/compat/accept4.c +17 -0
- data/vendor/libressl/apps/nc/compat/readpassphrase.c +205 -0
- data/vendor/libressl/apps/nc/compat/socket.c +29 -0
- data/vendor/libressl/apps/nc/compat/sys/socket.h +30 -0
- data/vendor/libressl/apps/ocspcheck/CMakeLists.txt +44 -0
- data/vendor/libressl/apps/ocspcheck/Makefile.am +45 -0
- data/vendor/libressl/apps/ocspcheck/compat/.gitignore +0 -0
- data/vendor/libressl/apps/openssl/CMakeLists.txt +97 -0
- data/vendor/libressl/apps/openssl/Makefile.am +108 -0
- data/vendor/libressl/apps/openssl/apps_win.c +138 -0
- data/vendor/libressl/apps/openssl/certhash_win.c +13 -0
- data/vendor/libressl/apps/openssl/compat/clock_gettime_osx.c +26 -0
- data/vendor/libressl/apps/openssl/compat/poll_win.c +329 -0
- data/vendor/libressl/appveyor.yml +53 -0
- data/vendor/libressl/autogen.sh +15 -0
- data/vendor/libressl/check-release.sh +86 -0
- data/vendor/libressl/cmake_export_symbol.cmake +71 -0
- data/vendor/libressl/cmake_uninstall.cmake.in +36 -0
- data/vendor/libressl/config +17 -0
- data/vendor/libressl/configure.ac +165 -0
- data/vendor/libressl/crypto/CMakeLists.txt +863 -0
- data/vendor/libressl/crypto/Makefile.am +962 -0
- data/vendor/libressl/crypto/Makefile.am.arc4random +46 -0
- data/vendor/libressl/crypto/Makefile.am.elf-mips +14 -0
- data/vendor/libressl/crypto/Makefile.am.elf-mips64 +14 -0
- data/vendor/libressl/crypto/Makefile.am.elf-x86_64 +35 -0
- data/vendor/libressl/crypto/Makefile.am.macosx-x86_64 +35 -0
- data/vendor/libressl/crypto/Makefile.am.masm-x86_64 +22 -0
- data/vendor/libressl/crypto/Makefile.am.mingw64-x86_64 +23 -0
- data/vendor/libressl/crypto/arch/aarch64/crypto_cpu_caps_darwin.c +60 -0
- data/vendor/libressl/crypto/arch/aarch64/crypto_cpu_caps_linux.c +62 -0
- data/vendor/libressl/crypto/arch/aarch64/crypto_cpu_caps_none.c +26 -0
- data/vendor/libressl/crypto/arch/aarch64/crypto_cpu_caps_windows.c +36 -0
- data/vendor/libressl/crypto/arch/loongarch64/crypto_arch.h +21 -0
- data/vendor/libressl/crypto/arch/mips/crypto_arch.h +21 -0
- data/vendor/libressl/crypto/bn/arch/loongarch64/bn_arch.h +23 -0
- data/vendor/libressl/crypto/bn/arch/mips/bn_arch.h +24 -0
- data/vendor/libressl/crypto/compat/.gitignore +31 -0
- data/vendor/libressl/crypto/compat/arc4random.h +41 -0
- data/vendor/libressl/crypto/compat/b_win.c +55 -0
- data/vendor/libressl/crypto/compat/bsd-asprintf.c +96 -0
- data/vendor/libressl/crypto/compat/crypto_lock_win.c +56 -0
- data/vendor/libressl/crypto/compat/explicit_bzero_win.c +13 -0
- data/vendor/libressl/crypto/compat/freezero.c +32 -0
- data/vendor/libressl/crypto/compat/getdelim.c +78 -0
- data/vendor/libressl/crypto/compat/getline.c +40 -0
- data/vendor/libressl/crypto/compat/getopt_long.c +528 -0
- data/vendor/libressl/crypto/compat/getpagesize.c +18 -0
- data/vendor/libressl/crypto/compat/getprogname_linux.c +23 -0
- data/vendor/libressl/crypto/compat/getprogname_unimpl.c +7 -0
- data/vendor/libressl/crypto/compat/getprogname_windows.c +13 -0
- data/vendor/libressl/crypto/compat/posix_win.c +296 -0
- data/vendor/libressl/crypto/compat/syslog_r.c +19 -0
- data/vendor/libressl/crypto/compat/ui_openssl_win.c +334 -0
- data/vendor/libressl/dist.sh +22 -0
- data/vendor/libressl/gen-coverage-report.sh +58 -0
- data/vendor/libressl/gen-openbsd-tags.sh +20 -0
- data/vendor/libressl/include/CMakeLists.txt +61 -0
- data/vendor/libressl/include/Makefile.am +79 -0
- data/vendor/libressl/include/arch/loongarch64/opensslconf.h +150 -0
- data/vendor/libressl/include/arch/mips/opensslconf.h +150 -0
- data/vendor/libressl/include/compat/arpa/inet.h +15 -0
- data/vendor/libressl/include/compat/arpa/nameser.h +25 -0
- data/vendor/libressl/include/compat/cet.h +19 -0
- data/vendor/libressl/include/compat/dirent.h +17 -0
- data/vendor/libressl/include/compat/dirent_msvc.h +611 -0
- data/vendor/libressl/include/compat/endian.h +161 -0
- data/vendor/libressl/include/compat/err.h +95 -0
- data/vendor/libressl/include/compat/fcntl.h +32 -0
- data/vendor/libressl/include/compat/getopt.h +50 -0
- data/vendor/libressl/include/compat/limits.h +25 -0
- data/vendor/libressl/include/compat/netdb.h +10 -0
- data/vendor/libressl/include/compat/netinet/in.h +19 -0
- data/vendor/libressl/include/compat/netinet/ip.h +49 -0
- data/vendor/libressl/include/compat/netinet/tcp.h +10 -0
- data/vendor/libressl/include/compat/poll.h +63 -0
- data/vendor/libressl/include/compat/pthread.h +122 -0
- data/vendor/libressl/include/compat/readpassphrase.h +44 -0
- data/vendor/libressl/include/compat/resolv.h +24 -0
- data/vendor/libressl/include/compat/stdint.h +31 -0
- data/vendor/libressl/include/compat/stdio.h +65 -0
- data/vendor/libressl/include/compat/stdlib.h +57 -0
- data/vendor/libressl/include/compat/string.h +98 -0
- data/vendor/libressl/include/compat/sys/_null.h +18 -0
- data/vendor/libressl/include/compat/sys/ioctl.h +11 -0
- data/vendor/libressl/include/compat/sys/mman.h +19 -0
- data/vendor/libressl/include/compat/sys/param.h +15 -0
- data/vendor/libressl/include/compat/sys/queue.h +536 -0
- data/vendor/libressl/include/compat/sys/select.h +10 -0
- data/vendor/libressl/include/compat/sys/socket.h +18 -0
- data/vendor/libressl/include/compat/sys/stat.h +129 -0
- data/vendor/libressl/include/compat/sys/time.h +37 -0
- data/vendor/libressl/include/compat/sys/tree.h +1006 -0
- data/vendor/libressl/include/compat/sys/types.h +69 -0
- data/vendor/libressl/include/compat/sys/uio.h +17 -0
- data/vendor/libressl/include/compat/syslog.h +38 -0
- data/vendor/libressl/include/compat/time.h +59 -0
- data/vendor/libressl/include/compat/unistd.h +83 -0
- data/vendor/libressl/include/compat/win32netcompat.h +57 -0
- data/vendor/libressl/include/openssl/Makefile.am.tpl +45 -0
- data/vendor/libressl/libcrypto.pc.in +28 -0
- data/vendor/libressl/libressl.pub +2 -0
- data/vendor/libressl/libssl.pc.in +28 -0
- data/vendor/libressl/libtls.pc.in +28 -0
- data/vendor/libressl/m4/ax_add_fortify_source.m4 +80 -0
- data/vendor/libressl/m4/ax_check_compile_flag.m4 +53 -0
- data/vendor/libressl/m4/check-hardening-options.m4 +110 -0
- data/vendor/libressl/m4/check-libc.m4 +189 -0
- data/vendor/libressl/m4/check-os-options.m4 +181 -0
- data/vendor/libressl/m4/disable-compiler-warnings.m4 +44 -0
- data/vendor/libressl/man/CMakeLists.txt +26 -0
- data/vendor/libressl/man/links +2780 -0
- data/vendor/libressl/man/update_links.sh +25 -0
- data/vendor/libressl/openssl.pc.in +11 -0
- data/vendor/libressl/patches/bn_shift.patch +34 -0
- data/vendor/libressl/patches/crypto_arch.h.patch +34 -0
- data/vendor/libressl/patches/crypto_namespace.h.patch +22 -0
- data/vendor/libressl/patches/netcat.c.patch +178 -0
- data/vendor/libressl/patches/openssl.c.patch +12 -0
- data/vendor/libressl/patches/opensslfeatures.h.patch +49 -0
- data/vendor/libressl/patches/patch-amd64-crypto-cpu-caps.c.patch +20 -0
- data/vendor/libressl/patches/patch-i386-crypto-cpu-caps.c.patch +20 -0
- data/vendor/libressl/patches/speed.c.patch +114 -0
- data/vendor/libressl/patches/ssl_namespace.h.patch +21 -0
- data/vendor/libressl/patches/tls.h.patch +16 -0
- data/vendor/libressl/patches/tls_config.c.patch +15 -0
- data/vendor/libressl/patches/win32_amd64_bn_arch.h.patch +28 -0
- data/vendor/libressl/patches/windows_headers.patch +80 -0
- data/vendor/libressl/scripts/config.guess +1774 -0
- data/vendor/libressl/scripts/config.sub +1907 -0
- data/vendor/libressl/scripts/i686-w64-mingw32.cmake +9 -0
- data/vendor/libressl/scripts/test +210 -0
- data/vendor/libressl/scripts/wrap-compiler-for-flag-check +31 -0
- data/vendor/libressl/scripts/x86_64-w64-mingw32.cmake +9 -0
- data/vendor/libressl/ssl/CMakeLists.txt +183 -0
- data/vendor/libressl/ssl/Makefile.am +187 -0
- data/vendor/libressl/tests/CMakeLists.txt +970 -0
- data/vendor/libressl/tests/Makefile.am +944 -0
- data/vendor/libressl/tests/aeadtest.sh +30 -0
- data/vendor/libressl/tests/arc4randomforktest.sh +21 -0
- data/vendor/libressl/tests/asn1time_small.test +10 -0
- data/vendor/libressl/tests/cmake/CMakeLists.txt +52 -0
- data/vendor/libressl/tests/cmake/crypto.c +7 -0
- data/vendor/libressl/tests/cmake/ssl.c +6 -0
- data/vendor/libressl/tests/cmake/tls.c +6 -0
- data/vendor/libressl/tests/compat/pipe2.c +186 -0
- data/vendor/libressl/tests/dtlstest.sh +28 -0
- data/vendor/libressl/tests/evptest.sh +22 -0
- data/vendor/libressl/tests/keypairtest.sh +27 -0
- data/vendor/libressl/tests/mlkem_tests.sh +39 -0
- data/vendor/libressl/tests/ocsptest.bat +25 -0
- data/vendor/libressl/tests/ocsptest.sh +23 -0
- data/vendor/libressl/tests/openssl.cnf +29 -0
- data/vendor/libressl/tests/optionstest.c +381 -0
- data/vendor/libressl/tests/pidwraptest.c +85 -0
- data/vendor/libressl/tests/pidwraptest.sh +26 -0
- data/vendor/libressl/tests/quictest.bat +27 -0
- data/vendor/libressl/tests/quictest.sh +30 -0
- data/vendor/libressl/tests/renegotiation_test.bat +27 -0
- data/vendor/libressl/tests/renegotiation_test.sh +30 -0
- data/vendor/libressl/tests/rfc5280time_small.test +10 -0
- data/vendor/libressl/tests/servertest.bat +27 -0
- data/vendor/libressl/tests/servertest.sh +30 -0
- data/vendor/libressl/tests/shutdowntest.bat +27 -0
- data/vendor/libressl/tests/shutdowntest.sh +30 -0
- data/vendor/libressl/tests/ssltest.bat +32 -0
- data/vendor/libressl/tests/ssltest.sh +48 -0
- data/vendor/libressl/tests/testdsa.bat +47 -0
- data/vendor/libressl/tests/testdsa.sh +57 -0
- data/vendor/libressl/tests/testenc.bat +85 -0
- data/vendor/libressl/tests/testenc.sh +93 -0
- data/vendor/libressl/tests/testrsa.bat +47 -0
- data/vendor/libressl/tests/testrsa.sh +57 -0
- data/vendor/libressl/tests/testssl.bat +171 -0
- data/vendor/libressl/tests/tlstest.bat +27 -0
- data/vendor/libressl/tests/tlstest.sh +28 -0
- data/vendor/libressl/tls/CMakeLists.txt +125 -0
- data/vendor/libressl/tls/Makefile.am +76 -0
- data/vendor/libressl/tls/compat/ftruncate.c +17 -0
- data/vendor/libressl/tls/compat/pread.c +29 -0
- data/vendor/libressl/tls/compat/pwrite.c +29 -0
- data/vendor/libressl/update.sh +460 -0
- data/vendor/liburing/.github/workflows/ci.yml +8 -0
- data/vendor/liburing/configure +23 -2
- data/vendor/liburing/examples/helpers.c +1 -1
- data/vendor/liburing/examples/helpers.h +1 -1
- data/vendor/liburing/examples/reg-wait.c +3 -3
- data/vendor/liburing/examples/zcrx.c +5 -5
- data/vendor/liburing/liburing.spec +1 -1
- data/vendor/liburing/src/include/liburing/io_uring.h +16 -0
- data/vendor/liburing/src/include/liburing.h +20 -4
- data/vendor/liburing/src/lib.h +2 -4
- data/vendor/liburing/src/liburing-ffi.map +7 -0
- data/vendor/liburing/src/liburing.map +7 -0
- data/vendor/liburing/src/register.c +5 -0
- data/vendor/liburing/src/sanitize.c +5 -4
- data/vendor/liburing/src/setup.c +43 -28
- data/vendor/liburing/test/Makefile +7 -0
- data/vendor/liburing/test/cmd-discard.c +2 -2
- data/vendor/liburing/test/evfd-short-read.c +84 -0
- data/vendor/liburing/test/fdinfo-sqpoll.c +117 -0
- data/vendor/liburing/test/fdinfo.c +1 -1
- data/vendor/liburing/test/fixed-buf-merge.c +2 -2
- data/vendor/liburing/test/futex-kill.c +135 -0
- data/vendor/liburing/test/helpers.c +1 -1
- data/vendor/liburing/test/helpers.h +1 -1
- data/vendor/liburing/test/init-mem.c +50 -12
- data/vendor/liburing/test/io_uring_passthrough.c +25 -6
- data/vendor/liburing/test/msg-ring.c +123 -9
- data/vendor/liburing/test/recv-bundle-short-ooo.c +16 -1
- data/vendor/liburing/test/recv-inc-ooo.c +411 -0
- data/vendor/liburing/test/recv-mshot-fair.c +513 -0
- data/vendor/liburing/test/reg-wait.c +14 -14
- data/vendor/liburing/test/send-zerocopy.c +4 -4
- data/vendor/liburing/test/timerfd-short-read.c +81 -0
- data/vendor/liburing/test/timestamp.c +382 -0
- data/vendor/liburing/test/zcrx.c +22 -22
- metadata +222 -2
@@ -0,0 +1,25 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
|
3
|
+
# Run this periodically to ensure that the manpage links are up to date
|
4
|
+
(
|
5
|
+
cd /usr/src/usr.bin/mandoc/
|
6
|
+
make obj
|
7
|
+
make cleandir
|
8
|
+
make depend
|
9
|
+
make
|
10
|
+
cd /usr/src/regress/usr.bin/mandoc/db/mlinks/
|
11
|
+
make obj
|
12
|
+
make cleandir
|
13
|
+
make
|
14
|
+
)
|
15
|
+
|
16
|
+
makewhatis -a .
|
17
|
+
|
18
|
+
# We have to filter out some links that fail on case-insensitive filesystems
|
19
|
+
# Running makewhatis with the right arguments should work on mandoc systems.
|
20
|
+
echo "# This is an auto-generated file by $0" > links
|
21
|
+
/usr/src/regress/usr.bin/mandoc/db/mlinks/obj/mlinks mandoc.db | \
|
22
|
+
grep -v OCSP_crlID_new | \
|
23
|
+
grep -v bn_print | \
|
24
|
+
grep -v "<type>" | \
|
25
|
+
sort >> links
|
@@ -0,0 +1,11 @@
|
|
1
|
+
#openssl pkg-config source file
|
2
|
+
|
3
|
+
prefix=@prefix@
|
4
|
+
exec_prefix=@exec_prefix@
|
5
|
+
libdir=@libdir@
|
6
|
+
includedir=@includedir@
|
7
|
+
|
8
|
+
Name: LibreSSL
|
9
|
+
Description: Secure Sockets Layer and cryptography libraries and tools
|
10
|
+
Version: @VERSION@
|
11
|
+
Requires: libssl libcrypto
|
@@ -0,0 +1,34 @@
|
|
1
|
+
--- tests/bn_shift.c.orig 2023-02-13 20:06:27.295678033 -0600
|
2
|
+
+++ tests/bn_shift.c 2023-02-13 20:08:08.335677654 -0600
|
3
|
+
@@ -355,6 +355,8 @@
|
4
|
+
return failed;
|
5
|
+
}
|
6
|
+
|
7
|
+
+#if 0
|
8
|
+
+
|
9
|
+
static void
|
10
|
+
benchmark_bn_lshift1(BIGNUM *bn)
|
11
|
+
{
|
12
|
+
@@ -620,9 +622,12 @@
|
13
|
+
BN_free(bn);
|
14
|
+
}
|
15
|
+
|
16
|
+
+#endif
|
17
|
+
+
|
18
|
+
static void
|
19
|
+
benchmark_bn_shift(void)
|
20
|
+
{
|
21
|
+
+#if 0
|
22
|
+
const struct benchmark *bm;
|
23
|
+
size_t i;
|
24
|
+
|
25
|
+
@@ -630,6 +635,9 @@
|
26
|
+
bm = &benchmarks[i];
|
27
|
+
benchmark_run(bm, 5);
|
28
|
+
}
|
29
|
+
+#else
|
30
|
+
+ return;
|
31
|
+
+#endif
|
32
|
+
}
|
33
|
+
|
34
|
+
int
|
@@ -0,0 +1,34 @@
|
|
1
|
+
--- crypto/arch/amd64/crypto_arch.h.orig Fri Feb 14 06:00:43 2025
|
2
|
+
+++ crypto/arch/amd64/crypto_arch.h Fri Feb 14 06:01:13 2025
|
3
|
+
@@ -40,6 +40,7 @@ extern uint64_t crypto_cpu_caps_amd64;
|
4
|
+
#define HAVE_RC4_INTERNAL
|
5
|
+
#define HAVE_RC4_SET_KEY_INTERNAL
|
6
|
+
|
7
|
+
+#if 0
|
8
|
+
#define HAVE_SHA1_BLOCK_DATA_ORDER
|
9
|
+
#define HAVE_SHA1_BLOCK_GENERIC
|
10
|
+
|
11
|
+
@@ -48,6 +49,7 @@ extern uint64_t crypto_cpu_caps_amd64;
|
12
|
+
|
13
|
+
#define HAVE_SHA512_BLOCK_DATA_ORDER
|
14
|
+
#define HAVE_SHA512_BLOCK_GENERIC
|
15
|
+
+#endif
|
16
|
+
|
17
|
+
#endif
|
18
|
+
|
19
|
+
--- crypto/arch/aarch64/crypto_arch.h.orig Thu Mar 13 05:42:37 2025
|
20
|
+
+++ crypto/arch/aarch64/crypto_arch.h Thu Mar 13 05:47:39 2025
|
21
|
+
@@ -33,11 +33,13 @@
|
22
|
+
#define CRYPTO_CPU_CAPS_AARCH64_SHA512 (1ULL << 4)
|
23
|
+
#define CRYPTO_CPU_CAPS_AARCH64_SHA3 (1ULL << 5)
|
24
|
+
|
25
|
+
+#if 0
|
26
|
+
#ifndef OPENSSL_NO_ASM
|
27
|
+
|
28
|
+
#define HAVE_SHA256_BLOCK_DATA_ORDER
|
29
|
+
#define HAVE_SHA512_BLOCK_DATA_ORDER
|
30
|
+
|
31
|
+
+#endif
|
32
|
+
#endif
|
33
|
+
|
34
|
+
#endif
|
@@ -0,0 +1,22 @@
|
|
1
|
+
--- crypto/hidden/crypto_namespace.h.orig Fri Aug 2 23:52:55 2024
|
2
|
+
+++ crypto/hidden/crypto_namespace.h Fri Aug 2 23:53:17 2024
|
3
|
+
@@ -24,6 +24,12 @@
|
4
|
+
* external calls use the latter name.
|
5
|
+
*/
|
6
|
+
|
7
|
+
+#ifdef _MSC_VER
|
8
|
+
+# define LCRYPTO_UNUSED(x)
|
9
|
+
+# define LCRYPTO_USED(x)
|
10
|
+
+# define LCRYPTO_ALIAS1(pre, x)
|
11
|
+
+# define LCRYPTO_ALIAS(x)
|
12
|
+
+#else
|
13
|
+
#ifdef LIBRESSL_NAMESPACE
|
14
|
+
#ifdef LIBRESSL_CRYPTO_NAMESPACE
|
15
|
+
# define LCRYPTO_UNUSED(x) __attribute__((deprecated)) \
|
16
|
+
@@ -47,5 +53,6 @@
|
17
|
+
# define LCRYPTO_ALIAS1(pre,x)
|
18
|
+
# define LCRYPTO_ALIAS(x) asm("")
|
19
|
+
#endif
|
20
|
+
+#endif /* _MSC_VER */
|
21
|
+
|
22
|
+
#endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */
|
@@ -0,0 +1,178 @@
|
|
1
|
+
--- apps/nc/netcat.c.orig Sat May 31 03:18:05 2025
|
2
|
+
+++ apps/nc/netcat.c Sat May 31 03:18:17 2025
|
3
|
+
@@ -93,9 +93,13 @@ int zflag; /* Port Scan Flag */
|
4
|
+
int Dflag; /* sodebug */
|
5
|
+
int Iflag; /* TCP receive buffer size */
|
6
|
+
int Oflag; /* TCP send buffer size */
|
7
|
+
+#ifdef TCP_MD5SIG
|
8
|
+
int Sflag; /* TCP MD5 signature option */
|
9
|
+
+#endif
|
10
|
+
int Tflag = -1; /* IP Type of Service */
|
11
|
+
+#ifdef SO_RTABLE
|
12
|
+
int rtableid = -1;
|
13
|
+
+#endif
|
14
|
+
|
15
|
+
int usetls; /* use TLS */
|
16
|
+
const char *Cflag; /* Public cert file */
|
17
|
+
@@ -270,12 +274,14 @@ main(int argc, char *argv[])
|
18
|
+
case 'u':
|
19
|
+
uflag = 1;
|
20
|
+
break;
|
21
|
+
+#ifdef SO_RTABLE
|
22
|
+
case 'V':
|
23
|
+
rtableid = (int)strtonum(optarg, 0,
|
24
|
+
RT_TABLEID_MAX, &errstr);
|
25
|
+
if (errstr)
|
26
|
+
errx(1, "rtable %s: %s", errstr, optarg);
|
27
|
+
break;
|
28
|
+
+#endif
|
29
|
+
case 'v':
|
30
|
+
vflag = 1;
|
31
|
+
break;
|
32
|
+
@@ -322,9 +328,11 @@ main(int argc, char *argv[])
|
33
|
+
case 'o':
|
34
|
+
oflag = optarg;
|
35
|
+
break;
|
36
|
+
+#ifdef TCP_MD5SIG
|
37
|
+
case 'S':
|
38
|
+
Sflag = 1;
|
39
|
+
break;
|
40
|
+
+#endif
|
41
|
+
case 'T':
|
42
|
+
errstr = NULL;
|
43
|
+
errno = 0;
|
44
|
+
@@ -348,9 +356,11 @@ main(int argc, char *argv[])
|
45
|
+
argc -= optind;
|
46
|
+
argv += optind;
|
47
|
+
|
48
|
+
+#ifdef SO_RTABLE
|
49
|
+
if (rtableid >= 0)
|
50
|
+
if (setrtable(rtableid) == -1)
|
51
|
+
err(1, "setrtable");
|
52
|
+
+#endif
|
53
|
+
|
54
|
+
/* Cruft to make sure options are clean, and used properly. */
|
55
|
+
if (argc == 1 && family == AF_UNIX) {
|
56
|
+
@@ -925,7 +935,10 @@ remote_connect(const char *host, const char *port, str
|
57
|
+
char *ipaddr)
|
58
|
+
{
|
59
|
+
struct addrinfo *res, *res0;
|
60
|
+
- int s = -1, error, herr, on = 1, save_errno;
|
61
|
+
+ int s = -1, error, herr, save_errno;
|
62
|
+
+#ifdef SO_BINDANY
|
63
|
+
+ int on = 1;
|
64
|
+
+#endif
|
65
|
+
|
66
|
+
if ((error = getaddrinfo(host, port, &hints, &res0)))
|
67
|
+
errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
|
68
|
+
@@ -940,8 +953,10 @@ remote_connect(const char *host, const char *port, str
|
69
|
+
if (sflag || pflag) {
|
70
|
+
struct addrinfo ahints, *ares;
|
71
|
+
|
72
|
+
+#ifdef SO_BINDANY
|
73
|
+
/* try SO_BINDANY, but don't insist */
|
74
|
+
setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
|
75
|
+
+#endif
|
76
|
+
memset(&ahints, 0, sizeof(struct addrinfo));
|
77
|
+
ahints.ai_family = res->ai_family;
|
78
|
+
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
|
79
|
+
@@ -1033,7 +1048,10 @@ int
|
80
|
+
local_listen(const char *host, const char *port, struct addrinfo hints)
|
81
|
+
{
|
82
|
+
struct addrinfo *res, *res0;
|
83
|
+
- int s = -1, ret, x = 1, save_errno;
|
84
|
+
+ int s = -1, save_errno;
|
85
|
+
+#ifdef SO_REUSEPORT
|
86
|
+
+ int ret, x = 1;
|
87
|
+
+#endif
|
88
|
+
int error;
|
89
|
+
|
90
|
+
/* Allow nodename to be null. */
|
91
|
+
@@ -1054,9 +1072,11 @@ local_listen(const char *host, const char *port, struc
|
92
|
+
res->ai_protocol)) == -1)
|
93
|
+
continue;
|
94
|
+
|
95
|
+
+#ifdef SO_REUSEPORT
|
96
|
+
ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
|
97
|
+
if (ret == -1)
|
98
|
+
err(1, NULL);
|
99
|
+
+#endif
|
100
|
+
|
101
|
+
set_common_sockopts(s, res->ai_family);
|
102
|
+
|
103
|
+
@@ -1561,11 +1581,13 @@ set_common_sockopts(int s, int af)
|
104
|
+
{
|
105
|
+
int x = 1;
|
106
|
+
|
107
|
+
+#ifdef TCP_MD5SIG
|
108
|
+
if (Sflag) {
|
109
|
+
if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
|
110
|
+
&x, sizeof(x)) == -1)
|
111
|
+
err(1, NULL);
|
112
|
+
}
|
113
|
+
+#endif
|
114
|
+
if (Dflag) {
|
115
|
+
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
|
116
|
+
&x, sizeof(x)) == -1)
|
117
|
+
@@ -1576,9 +1598,16 @@ set_common_sockopts(int s, int af)
|
118
|
+
IP_TOS, &Tflag, sizeof(Tflag)) == -1)
|
119
|
+
err(1, "set IP ToS");
|
120
|
+
|
121
|
+
+#ifdef IPV6_TCLASS
|
122
|
+
else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
|
123
|
+
IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
|
124
|
+
err(1, "set IPv6 traffic class");
|
125
|
+
+#else
|
126
|
+
+ else if (af == AF_INET6) {
|
127
|
+
+ errno = ENOPROTOOPT;
|
128
|
+
+ err(1, "set IPv6 traffic class not supported");
|
129
|
+
+ }
|
130
|
+
+#endif
|
131
|
+
}
|
132
|
+
if (Iflag) {
|
133
|
+
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
|
134
|
+
@@ -1602,13 +1631,17 @@ set_common_sockopts(int s, int af)
|
135
|
+
}
|
136
|
+
|
137
|
+
if (minttl != -1) {
|
138
|
+
+#ifdef IP_MINTTL
|
139
|
+
if (af == AF_INET && setsockopt(s, IPPROTO_IP,
|
140
|
+
IP_MINTTL, &minttl, sizeof(minttl)))
|
141
|
+
err(1, "set IP min TTL");
|
142
|
+
+#endif
|
143
|
+
|
144
|
+
- else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
|
145
|
+
+#ifdef IPV6_MINHOPCOUNT
|
146
|
+
+ if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
|
147
|
+
IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
|
148
|
+
err(1, "set IPv6 min hop count");
|
149
|
+
+#endif
|
150
|
+
}
|
151
|
+
}
|
152
|
+
|
153
|
+
@@ -1835,15 +1868,19 @@ help(void)
|
154
|
+
\t-P proxyuser\tUsername for proxy authentication\n\
|
155
|
+
\t-p port\t Specify local port for remote connects\n\
|
156
|
+
\t-R CAfile CA bundle\n\
|
157
|
+
- \t-r Randomize remote ports\n\
|
158
|
+
- \t-S Enable the TCP MD5 signature option\n\
|
159
|
+
- \t-s sourceaddr Local source address\n\
|
160
|
+
+ \t-r Randomize remote ports\n"
|
161
|
+
+#ifdef TCP_MD5SIG
|
162
|
+
+ "\t-S Enable the TCP MD5 signature option\n"
|
163
|
+
+#endif
|
164
|
+
+ "\t-s sourceaddr Local source address\n\
|
165
|
+
\t-T keyword TOS value or TLS options\n\
|
166
|
+
\t-t Answer TELNET negotiation\n\
|
167
|
+
\t-U Use UNIX domain socket\n\
|
168
|
+
- \t-u UDP mode\n\
|
169
|
+
- \t-V rtable Specify alternate routing table\n\
|
170
|
+
- \t-v Verbose\n\
|
171
|
+
+ \t-u UDP mode\n"
|
172
|
+
+#ifdef SO_RTABLE
|
173
|
+
+ "\t-V rtable Specify alternate routing table\n"
|
174
|
+
+#endif
|
175
|
+
+ "\t-v Verbose\n\
|
176
|
+
\t-W recvlimit Terminate after receiving a number of packets\n\
|
177
|
+
\t-w timeout Timeout for connects and final net reads\n\
|
178
|
+
\t-X proto Proxy protocol: \"4\", \"4A\", \"5\" (SOCKS) or \"connect\"\n\
|
@@ -0,0 +1,12 @@
|
|
1
|
+
--- apps/openssl/openssl.c.orig Sat May 31 03:18:05 2025
|
2
|
+
+++ apps/openssl/openssl.c Sat May 31 03:18:17 2025
|
3
|
+
@@ -341,7 +341,9 @@ BIO *bio_err = NULL;
|
4
|
+
static void
|
5
|
+
openssl_startup(void)
|
6
|
+
{
|
7
|
+
+#ifndef _WIN32
|
8
|
+
signal(SIGPIPE, SIG_IGN);
|
9
|
+
+#endif
|
10
|
+
|
11
|
+
OpenSSL_add_all_algorithms();
|
12
|
+
SSL_library_init();
|
@@ -0,0 +1,49 @@
|
|
1
|
+
--- include/openssl/opensslfeatures.h.orig Fri Jul 28 06:04:42 2023
|
2
|
+
+++ include/openssl/opensslfeatures.h Fri Jul 28 06:09:00 2023
|
3
|
+
@@ -8,6 +8,13 @@
|
4
|
+
#define LIBRESSL_HAS_TLS1_3
|
5
|
+
#define LIBRESSL_HAS_DTLS1_2
|
6
|
+
|
7
|
+
+/*
|
8
|
+
+ * Used for compatibility with compilers lacking __attribute__
|
9
|
+
+ */
|
10
|
+
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__)
|
11
|
+
+#define __attribute__(a)
|
12
|
+
+#endif
|
13
|
+
+
|
14
|
+
#define OPENSSL_THREADS
|
15
|
+
|
16
|
+
#define OPENSSL_NO_BUF_FREELISTS
|
17
|
+
--- crypto/crypto_internal.h.orig Sat Dec 14 14:15:39 2024
|
18
|
+
+++ crypto/crypto_internal.h Sat Dec 14 14:15:52 2024
|
19
|
+
@@ -15,6 +15,8 @@
|
20
|
+
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
21
|
+
*/
|
22
|
+
|
23
|
+
+#include <openssl/opensslfeatures.h>
|
24
|
+
+
|
25
|
+
#include <endian.h>
|
26
|
+
#include <stddef.h>
|
27
|
+
#include <stdint.h>
|
28
|
+
--- tests/parse_test_file.h.orig Thu Dec 26 01:13:00 2024
|
29
|
+
+++ tests/parse_test_file.h Thu Dec 26 01:13:27 2024
|
30
|
+
@@ -22,6 +22,8 @@
|
31
|
+
#include <stdint.h>
|
32
|
+
#include <stdio.h>
|
33
|
+
|
34
|
+
+#include <openssl/opensslfeatures.h>
|
35
|
+
+
|
36
|
+
#include "bytestring.h"
|
37
|
+
|
38
|
+
#if defined(__cplusplus)
|
39
|
+
--- tests/test.h.orig Sat May 31 04:48:09 2025
|
40
|
+
+++ tests/test.h Sat May 31 04:48:31 2025
|
41
|
+
@@ -18,6 +18,8 @@
|
42
|
+
#ifndef HEADER_TEST_H
|
43
|
+
#define HEADER_TEST_H
|
44
|
+
|
45
|
+
+#include <openssl/opensslfeatures.h>
|
46
|
+
+
|
47
|
+
#include <stddef.h>
|
48
|
+
#include <stdint.h>
|
49
|
+
|
@@ -0,0 +1,20 @@
|
|
1
|
+
--- crypto/arch/amd64/crypto_cpu_caps.c.orig Sat Dec 14 13:45:16 2024
|
2
|
+
+++ crypto/arch/amd64/crypto_cpu_caps.c Sat Dec 14 13:54:06 2024
|
3
|
+
@@ -37,7 +37,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e
|
4
|
+
{
|
5
|
+
uint32_t ebx = 0, ecx = 0, edx = 0;
|
6
|
+
|
7
|
+
-#ifndef OPENSSL_NO_ASM
|
8
|
+
+#if defined(__GNUC__) && !defined(OPENSSL_NO_ASM)
|
9
|
+
__asm__ ("cpuid": "+a"(eax), "+b"(ebx), "+c"(ecx), "+d"(edx));
|
10
|
+
#else
|
11
|
+
eax = 0;
|
12
|
+
@@ -58,7 +58,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_
|
13
|
+
{
|
14
|
+
uint32_t eax = 0, edx = 0;
|
15
|
+
|
16
|
+
-#ifndef OPENSSL_NO_ASM
|
17
|
+
+#if defined(__GNUC__) && !defined(OPENSSL_NO_ASM)
|
18
|
+
__asm__ ("xgetbv": "+a"(eax), "+c"(ecx), "+d"(edx));
|
19
|
+
#endif
|
20
|
+
|
@@ -0,0 +1,20 @@
|
|
1
|
+
--- crypto/arch/i386/crypto_cpu_caps.c.orig Fri Oct 18 17:35:20 2024
|
2
|
+
+++ crypto/arch/i386/crypto_cpu_caps.c Fri Oct 18 17:39:13 2024
|
3
|
+
@@ -33,7 +33,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e
|
4
|
+
{
|
5
|
+
uint32_t ebx = 0, ecx = 0, edx = 0;
|
6
|
+
|
7
|
+
-#ifndef OPENSSL_NO_ASM
|
8
|
+
+#if defined(__GNUC__) && !defined(OPENSSL_NO_ASM)
|
9
|
+
__asm__ ("cpuid": "+a"(eax), "+b"(ebx), "+c"(ecx), "+d"(edx));
|
10
|
+
#else
|
11
|
+
eax = 0;
|
12
|
+
@@ -54,7 +54,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_
|
13
|
+
{
|
14
|
+
uint32_t eax = 0, edx = 0;
|
15
|
+
|
16
|
+
-#ifndef OPENSSL_NO_ASM
|
17
|
+
+#if defined(__GNUC__) && !defined(OPENSSL_NO_ASM)
|
18
|
+
__asm__ ("xgetbv": "+a"(eax), "+c"(ecx), "+d"(edx));
|
19
|
+
#endif
|
20
|
+
|
@@ -0,0 +1,114 @@
|
|
1
|
+
--- apps/openssl/speed.c.orig Sat May 31 03:18:05 2025
|
2
|
+
+++ apps/openssl/speed.c Sat May 31 03:18:17 2025
|
3
|
+
@@ -154,7 +154,16 @@ static void
|
4
|
+
pkey_print_message(const char *str, const char *str2,
|
5
|
+
long num, int bits, int sec);
|
6
|
+
static void print_result(int alg, int run_no, int count, double time_used);
|
7
|
+
+#ifndef _WIN32
|
8
|
+
static int do_multi(int multi);
|
9
|
+
+#else
|
10
|
+
+void speed_signal(int sigcatch, void (*func)(int sigraised));
|
11
|
+
+unsigned int speed_alarm(unsigned int seconds);
|
12
|
+
+void speed_alarm_free(int run);
|
13
|
+
+#define SIGALRM 14
|
14
|
+
+#define signal(sigcatch, func) speed_signal((sigcatch), (func))
|
15
|
+
+#define alarm(seconds) speed_alarm((seconds))
|
16
|
+
+#endif
|
17
|
+
|
18
|
+
#define ALGOR_NUM 31
|
19
|
+
#define SIZE_NUM 5
|
20
|
+
@@ -1087,8 +1096,10 @@ speed_main(int argc, char **argv)
|
21
|
+
const EVP_CIPHER *evp_cipher = NULL;
|
22
|
+
const EVP_MD *evp_md = NULL;
|
23
|
+
int decrypt = 0;
|
24
|
+
+#ifndef _WIN32
|
25
|
+
int multi = 0;
|
26
|
+
struct sigaction sa;
|
27
|
+
+#endif
|
28
|
+
const char *errstr = NULL;
|
29
|
+
|
30
|
+
if (pledge("stdio proc", NULL) == -1) {
|
31
|
+
@@ -1163,6 +1174,7 @@ speed_main(int argc, char **argv)
|
32
|
+
decrypt = 1;
|
33
|
+
j--; /* Otherwise, -decrypt gets confused with an
|
34
|
+
* algorithm. */
|
35
|
+
+#ifndef _WIN32
|
36
|
+
} else if (argc > 0 && strcmp(*argv, "-multi") == 0) {
|
37
|
+
argc--;
|
38
|
+
argv++;
|
39
|
+
@@ -1177,6 +1189,7 @@ speed_main(int argc, char **argv)
|
40
|
+
}
|
41
|
+
j--; /* Otherwise, -multi gets confused with an
|
42
|
+
* algorithm. */
|
43
|
+
+#endif
|
44
|
+
} else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) {
|
45
|
+
argc--;
|
46
|
+
argv++;
|
47
|
+
@@ -1491,7 +1504,9 @@ speed_main(int argc, char **argv)
|
48
|
+
BIO_printf(bio_err, "-evp e use EVP e.\n");
|
49
|
+
BIO_printf(bio_err, "-decrypt time decryption instead of encryption (only EVP).\n");
|
50
|
+
BIO_printf(bio_err, "-mr produce machine readable output.\n");
|
51
|
+
+#ifndef _WIN32
|
52
|
+
BIO_printf(bio_err, "-multi n run n benchmarks in parallel.\n");
|
53
|
+
+#endif
|
54
|
+
BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n");
|
55
|
+
goto end;
|
56
|
+
}
|
57
|
+
@@ -1500,8 +1515,10 @@ speed_main(int argc, char **argv)
|
58
|
+
j++;
|
59
|
+
}
|
60
|
+
|
61
|
+
+#ifndef _WIN32
|
62
|
+
if (multi && do_multi(multi))
|
63
|
+
goto show_res;
|
64
|
+
+#endif
|
65
|
+
|
66
|
+
if (j == 0) {
|
67
|
+
for (i = 0; i < ALGOR_NUM; i++) {
|
68
|
+
@@ -1573,11 +1590,13 @@ speed_main(int argc, char **argv)
|
69
|
+
#define COND(c) (run && count<0x7fffffff)
|
70
|
+
#define COUNT(d) (count)
|
71
|
+
|
72
|
+
+#ifndef _WIN32
|
73
|
+
memset(&sa, 0, sizeof(sa));
|
74
|
+
sigemptyset(&sa.sa_mask);
|
75
|
+
sa.sa_flags = SA_RESTART;
|
76
|
+
sa.sa_handler = sig_done;
|
77
|
+
sigaction(SIGALRM, &sa, NULL);
|
78
|
+
+#endif
|
79
|
+
|
80
|
+
#ifndef OPENSSL_NO_MD4
|
81
|
+
if (doit[D_MD4]) {
|
82
|
+
@@ -2370,7 +2389,9 @@ speed_main(int argc, char **argv)
|
83
|
+
ecdh_doit[j] = 0;
|
84
|
+
}
|
85
|
+
}
|
86
|
+
+#ifndef _WIN32
|
87
|
+
show_res:
|
88
|
+
+#endif
|
89
|
+
if (!mr) {
|
90
|
+
fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION));
|
91
|
+
fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
|
92
|
+
@@ -2526,11 +2547,15 @@ pkey_print_message(const char *str, const char *str2,
|
93
|
+
static void
|
94
|
+
print_result(int alg, int run_no, int count, double time_used)
|
95
|
+
{
|
96
|
+
+#ifdef _WIN32
|
97
|
+
+ speed_alarm_free(run);
|
98
|
+
+#endif
|
99
|
+
BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
|
100
|
+
: "%d %s in %.2fs\n", count, names[alg], time_used);
|
101
|
+
results[alg][run_no] = ((double) count) / time_used * lengths[run_no];
|
102
|
+
}
|
103
|
+
|
104
|
+
+#ifndef _WIN32
|
105
|
+
static char *
|
106
|
+
sstrsep(char **string, const char *delim)
|
107
|
+
{
|
108
|
+
@@ -2731,5 +2756,6 @@ do_multi(int multi)
|
109
|
+
free(fds);
|
110
|
+
return 1;
|
111
|
+
}
|
112
|
+
+#endif
|
113
|
+
|
114
|
+
#endif /* OPENSSL_NO_SPEED */
|
@@ -0,0 +1,21 @@
|
|
1
|
+
--- ssl/hidden/ssl_namespace.h.orig Fri Aug 2 23:52:55 2024
|
2
|
+
+++ ssl/hidden/ssl_namespace.h Fri Aug 2 23:53:17 2024
|
3
|
+
@@ -23,6 +23,11 @@
|
4
|
+
* and we alias that to the normal name.
|
5
|
+
*/
|
6
|
+
|
7
|
+
+#ifdef _MSC_VER
|
8
|
+
+#define LSSL_UNUSED(x)
|
9
|
+
+#define LSSL_USED(x)
|
10
|
+
+#define LSSL_ALIAS(x)
|
11
|
+
+#else
|
12
|
+
#ifdef LIBRESSL_NAMESPACE
|
13
|
+
#define LSSL_UNUSED(x) typeof(x) x __attribute__((deprecated))
|
14
|
+
#define LSSL_USED(x) __attribute__((visibility("hidden"))) \
|
15
|
+
@@ -37,5 +42,6 @@
|
16
|
+
#define LSSL_USED(x)
|
17
|
+
#define LSSL_ALIAS(x) asm("")
|
18
|
+
#endif
|
19
|
+
+#endif /* _MSC_VER */
|
20
|
+
|
21
|
+
#endif /* _LIBSSL_SSL_NAMESPACE_H_ */
|
@@ -0,0 +1,16 @@
|
|
1
|
+
--- include/tls.h.orig 2017-02-13 20:19:55.918636579 +0900
|
2
|
+
+++ include/tls.h 2017-02-13 20:21:18.313073161 +0900
|
3
|
+
@@ -22,6 +22,13 @@
|
4
|
+
extern "C" {
|
5
|
+
#endif
|
6
|
+
|
7
|
+
+#ifdef _MSC_VER
|
8
|
+
+#ifndef LIBRESSL_INTERNAL
|
9
|
+
+#include <basetsd.h>
|
10
|
+
+typedef SSIZE_T ssize_t;
|
11
|
+
+#endif
|
12
|
+
+#endif
|
13
|
+
+
|
14
|
+
#include <sys/types.h>
|
15
|
+
|
16
|
+
#include <stddef.h>
|
@@ -0,0 +1,15 @@
|
|
1
|
+
uid_t can be 64-bit
|
2
|
+
|
3
|
+
--- tls/tls_config.c.orig 2024-11-02 21:19:47.090322191 +0100
|
4
|
+
+++ tls/tls_config.c 2024-11-02 21:38:22.527071689 +0100
|
5
|
+
@@ -742,8 +742,8 @@
|
6
|
+
|
7
|
+
if (sb.st_uid != getuid()) {
|
8
|
+
tls_config_set_errorx(config, TLS_ERROR_UNKNOWN,
|
9
|
+
- "session file has incorrect owner (uid %u != %u)",
|
10
|
+
- sb.st_uid, getuid());
|
11
|
+
+ "session file has incorrect owner (uid %llu != %llu)",
|
12
|
+
+ (unsigned long long)sb.st_uid, (unsigned long long)getuid());
|
13
|
+
return (-1);
|
14
|
+
}
|
15
|
+
mugo = sb.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO);
|
@@ -0,0 +1,28 @@
|
|
1
|
+
We should consider a OPENSSL_NO_BN_ASM if we can't figure
|
2
|
+
out how to fix BIGNUM on this OS
|
3
|
+
|
4
|
+
--- crypto/bn/arch/amd64/bn_arch.h.orig Wed Mar 27 22:17:03 2024
|
5
|
+
+++ crypto/bn/arch/amd64/bn_arch.h Wed Mar 27 22:17:31 2024
|
6
|
+
@@ -20,8 +20,14 @@
|
7
|
+
#ifndef HEADER_BN_ARCH_H
|
8
|
+
#define HEADER_BN_ARCH_H
|
9
|
+
|
10
|
+
+#ifdef _WIN32
|
11
|
+
#ifndef OPENSSL_NO_ASM
|
12
|
+
+#define OPENSSL_NO_ASM
|
13
|
+
+#endif
|
14
|
+
+#else
|
15
|
+
|
16
|
+
+#ifndef OPENSSL_NO_ASM
|
17
|
+
+
|
18
|
+
#define HAVE_BN_ADD
|
19
|
+
#define HAVE_BN_ADD_WORDS
|
20
|
+
|
21
|
+
@@ -104,6 +110,7 @@ bn_subw(BN_ULONG a, BN_ULONG b, BN_ULONG *out_borrow,
|
22
|
+
}
|
23
|
+
|
24
|
+
#endif /* __GNUC__ */
|
25
|
+
+#endif /* _WIN32 */
|
26
|
+
|
27
|
+
#endif
|
28
|
+
#endif
|
@@ -0,0 +1,80 @@
|
|
1
|
+
--- include/openssl/dtls1.h.orig Wed Nov 1 13:15:36 2023
|
2
|
+
+++ include/openssl/dtls1.h Wed Nov 1 13:15:54 2023
|
3
|
+
@@ -60,7 +60,11 @@
|
4
|
+
#ifndef HEADER_DTLS1_H
|
5
|
+
#define HEADER_DTLS1_H
|
6
|
+
|
7
|
+
+#if defined(_WIN32)
|
8
|
+
+#include <winsock2.h>
|
9
|
+
+#else
|
10
|
+
#include <sys/time.h>
|
11
|
+
+#endif
|
12
|
+
|
13
|
+
#include <stdio.h>
|
14
|
+
#include <stdlib.h>
|
15
|
+
--- include/openssl/ossl_typ.h.orig Wed Nov 1 13:15:36 2023
|
16
|
+
+++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023
|
17
|
+
@@ -82,6 +82,21 @@ typedef struct asn1_object_st ASN1_OBJECT;
|
18
|
+
typedef struct ASN1_ITEM_st ASN1_ITEM;
|
19
|
+
typedef struct asn1_pctx_st ASN1_PCTX;
|
20
|
+
|
21
|
+
+#if defined(_WIN32) && defined(__WINCRYPT_H__)
|
22
|
+
+#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING)
|
23
|
+
+#ifdef _MSC_VER
|
24
|
+
+#pragma message("Warning, overriding WinCrypt defines")
|
25
|
+
+#else
|
26
|
+
+#warning overriding WinCrypt defines
|
27
|
+
+#endif
|
28
|
+
+#endif
|
29
|
+
+#undef X509_NAME
|
30
|
+
+#undef X509_EXTENSIONS
|
31
|
+
+#undef OCSP_REQUEST
|
32
|
+
+#undef OCSP_RESPONSE
|
33
|
+
+#undef PKCS7_ISSUER_AND_SERIAL
|
34
|
+
+#endif
|
35
|
+
+
|
36
|
+
#ifdef BIGNUM
|
37
|
+
#undef BIGNUM
|
38
|
+
#endif
|
39
|
+
--- include/openssl/pkcs7.h.orig Wed Nov 1 13:15:36 2023
|
40
|
+
+++ include/openssl/pkcs7.h Wed Nov 1 13:17:58 2023
|
41
|
+
@@ -69,6 +69,18 @@
|
42
|
+
extern "C" {
|
43
|
+
#endif
|
44
|
+
|
45
|
+
+#if defined(_WIN32) && defined(__WINCRYPT_H__)
|
46
|
+
+#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING)
|
47
|
+
+#ifdef _MSC_VER
|
48
|
+
+#pragma message("Warning, overriding WinCrypt defines")
|
49
|
+
+#else
|
50
|
+
+#warning overriding WinCrypt defines
|
51
|
+
+#endif
|
52
|
+
+#endif
|
53
|
+
+#undef PKCS7_ISSUER_AND_SERIAL
|
54
|
+
+#undef PKCS7_SIGNER_INFO
|
55
|
+
+#endif
|
56
|
+
+
|
57
|
+
/*
|
58
|
+
Encryption_ID DES-CBC
|
59
|
+
Digest_ID MD5
|
60
|
+
--- include/openssl/x509.h.orig Wed Nov 1 13:15:36 2023
|
61
|
+
+++ include/openssl/x509.h Wed Nov 1 13:18:44 2023
|
62
|
+
@@ -100,6 +100,18 @@
|
63
|
+
extern "C" {
|
64
|
+
#endif
|
65
|
+
|
66
|
+
+#if defined(_WIN32) && defined(__WINCRYPT_H__)
|
67
|
+
+#if !defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_DISABLE_OVERRIDE_WINCRYPT_DEFINES_WARNING)
|
68
|
+
+#ifdef _MSC_VER
|
69
|
+
+#pragma message("Warning, overriding WinCrypt defines")
|
70
|
+
+#else
|
71
|
+
+#warning overriding WinCrypt defines
|
72
|
+
+#endif
|
73
|
+
+#endif
|
74
|
+
+#undef X509_NAME
|
75
|
+
+#undef X509_EXTENSIONS
|
76
|
+
+#endif
|
77
|
+
+
|
78
|
+
#define X509_FILETYPE_PEM 1
|
79
|
+
#define X509_FILETYPE_ASN1 2
|
80
|
+
#define X509_FILETYPE_DEFAULT 3
|