diff options
Diffstat (limited to 'patches')
-rw-r--r-- | patches/bio.h.patch | 8 | ||||
-rw-r--r-- | patches/bn_isqrt.c.patch | 8 | ||||
-rw-r--r-- | patches/bn_local.h.patch (renamed from patches/bn_lcl.h.patch) | 4 | ||||
-rw-r--r-- | patches/modes_local.h.patch (renamed from patches/modes_lcl.h.patch) | 4 | ||||
-rw-r--r-- | patches/openssl.c.patch | 6 | ||||
-rw-r--r-- | patches/opensslconf.h.patch | 24 | ||||
-rw-r--r-- | patches/speed.c.patch | 26 | ||||
-rw-r--r-- | patches/tlsexttest.c.patch | 12 | ||||
-rw-r--r-- | patches/windows_headers.patch | 13 |
9 files changed, 58 insertions, 47 deletions
diff --git a/patches/bio.h.patch b/patches/bio.h.patch index 072bc3b..f731879 100644 --- a/patches/bio.h.patch +++ b/patches/bio.h.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- include/openssl/bio.h.orig Mon Sep 5 22:30:32 2022 | 1 | --- include/openssl/bio.h.orig Tue Nov 22 21:08:27 2022 |
2 | +++ include/openssl/bio.h Tue Sep 6 01:38:22 2022 | 2 | +++ include/openssl/bio.h Tue Nov 22 21:08:48 2022 |
3 | @@ -666,8 +666,24 @@ void BIO_copy_next_retry(BIO *b); | 3 | @@ -667,8 +667,24 @@ void BIO_copy_next_retry(BIO *b); |
4 | 4 | ||
5 | /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ | 5 | /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ |
6 | 6 | ||
@@ -25,7 +25,7 @@ | |||
25 | __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); | 25 | __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); |
26 | int | 26 | int |
27 | BIO_vprintf(BIO *bio, const char *format, va_list args) | 27 | BIO_vprintf(BIO *bio, const char *format, va_list args) |
28 | @@ -680,6 +696,7 @@ int | 28 | @@ -681,6 +697,7 @@ int |
29 | BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) | 29 | BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) |
30 | __attribute__((__deprecated__, __format__(__printf__, 3, 0), | 30 | __attribute__((__deprecated__, __format__(__printf__, 3, 0), |
31 | __nonnull__(3))); | 31 | __nonnull__(3))); |
diff --git a/patches/bn_isqrt.c.patch b/patches/bn_isqrt.c.patch index bf205a3..5f2a568 100644 --- a/patches/bn_isqrt.c.patch +++ b/patches/bn_isqrt.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- tests/bn_isqrt.c.orig Mon Aug 15 10:40:29 2022 | 1 | --- tests/bn_isqrt.c.orig Fri Dec 9 11:05:26 2022 |
2 | +++ tests/bn_isqrt.c Mon Aug 15 10:41:46 2022 | 2 | +++ tests/bn_isqrt.c Fri Dec 9 11:12:37 2022 |
3 | @@ -304,6 +304,7 @@ main(int argc, char *argv[]) | 3 | @@ -306,6 +306,7 @@ main(int argc, char *argv[]) |
4 | int ch; | 4 | int ch; |
5 | int failed = 0, print = 0; | 5 | int failed = 0, print = 0; |
6 | 6 | ||
@@ -8,7 +8,7 @@ | |||
8 | while ((ch = getopt(argc, argv, "C")) != -1) { | 8 | while ((ch = getopt(argc, argv, "C")) != -1) { |
9 | switch (ch) { | 9 | switch (ch) { |
10 | case 'C': | 10 | case 'C': |
11 | @@ -314,6 +315,7 @@ main(int argc, char *argv[]) | 11 | @@ -316,6 +317,7 @@ main(int argc, char *argv[]) |
12 | break; | 12 | break; |
13 | } | 13 | } |
14 | } | 14 | } |
diff --git a/patches/bn_lcl.h.patch b/patches/bn_local.h.patch index 84835ed..2378ec7 100644 --- a/patches/bn_lcl.h.patch +++ b/patches/bn_local.h.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- ./crypto/bn/bn_lcl.h.orig Fri Feb 18 16:30:39 2022 | 1 | --- ./crypto/bn/bn_local.h.orig Fri Feb 18 16:30:39 2022 |
2 | +++ ./crypto/bn/bn_lcl.h Mon Feb 21 05:39:35 2022 | 2 | +++ ./crypto/bn/bn_local.h Mon Feb 21 05:39:35 2022 |
3 | @@ -283,7 +283,7 @@ | 3 | @@ -283,7 +283,7 @@ |
4 | : "r"(a), "r"(b)); \ | 4 | : "r"(a), "r"(b)); \ |
5 | ret; }) | 5 | ret; }) |
diff --git a/patches/modes_lcl.h.patch b/patches/modes_local.h.patch index 330d4d0..8f55eed 100644 --- a/patches/modes_lcl.h.patch +++ b/patches/modes_local.h.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- crypto/modes/modes_lcl.h.orig Tue Nov 14 10:25:15 2017 | 1 | --- crypto/modes/modes_local.h.orig Tue Nov 14 10:25:15 2017 |
2 | +++ crypto/modes/modes_lcl.h Sat Jan 19 22:19:23 2019 | 2 | +++ crypto/modes/modes_local.h Sat Jan 19 22:19:23 2019 |
3 | @@ -45,14 +45,16 @@ | 3 | @@ -45,14 +45,16 @@ |
4 | asm ("bswapl %0" \ | 4 | asm ("bswapl %0" \ |
5 | : "+r"(ret)); ret; }) | 5 | : "+r"(ret)); ret; }) |
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch index 2c2a3da..46702f2 100644 --- a/patches/openssl.c.patch +++ b/patches/openssl.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- apps/openssl/openssl.c.orig Thu Nov 7 18:19:01 2019 | 1 | --- apps/openssl/openssl.c.orig Sun Nov 27 10:48:36 2022 |
2 | +++ apps/openssl/openssl.c Fri Sep 4 04:04:26 2020 | 2 | +++ apps/openssl/openssl.c Sun Nov 27 10:48:49 2022 |
3 | @@ -360,7 +360,9 @@ | 3 | @@ -359,7 +359,9 @@ BIO *bio_err = NULL; |
4 | static void | 4 | static void |
5 | openssl_startup(void) | 5 | openssl_startup(void) |
6 | { | 6 | { |
diff --git a/patches/opensslconf.h.patch b/patches/opensslconf.h.patch new file mode 100644 index 0000000..ee5d645 --- /dev/null +++ b/patches/opensslconf.h.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | --- include/openssl/opensslconf.h.orig Tue Nov 22 21:08:27 2022 | ||
2 | +++ include/openssl/opensslconf.h Wed Nov 23 12:38:07 2022 | ||
3 | @@ -1,6 +1,21 @@ | ||
4 | #include <openssl/opensslfeatures.h> | ||
5 | /* crypto/opensslconf.h.in */ | ||
6 | |||
7 | +#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__) | ||
8 | +#define __attribute__(a) | ||
9 | +#endif | ||
10 | + | ||
11 | +#if defined(LIBRESSL_INTERNAL) && !defined(LIBRESSL_NAMESPACE) | ||
12 | +# define LCRYPTO_UNUSED(x) | ||
13 | +# define LCRYPTO_USED(x) | ||
14 | +# define LCRYPTO_ALIAS1(pre, x) | ||
15 | +# define LCRYPTO_ALIAS(x) | ||
16 | + | ||
17 | +# define LSSL_UNUSED(x) | ||
18 | +# define LSSL_USED(x) | ||
19 | +# define LSSL_ALIAS(x) | ||
20 | +#endif /* LIBRESSL_INTERNAL && !LIBRESSL_NAMESPACE */ | ||
21 | + | ||
22 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | ||
23 | #define OPENSSLDIR "/etc/ssl" | ||
24 | #endif | ||
diff --git a/patches/speed.c.patch b/patches/speed.c.patch index 11f9f03..4e80f31 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- apps/openssl/speed.c.orig Sun Feb 6 20:37:16 2022 | 1 | --- apps/openssl/speed.c.orig Tue Nov 22 17:32:11 2022 |
2 | +++ apps/openssl/speed.c Sun Feb 6 21:07:42 2022 | 2 | +++ apps/openssl/speed.c Tue Nov 22 18:33:13 2022 |
3 | @@ -159,7 +159,16 @@ | 3 | @@ -159,7 +159,16 @@ static void |
4 | pkey_print_message(const char *str, const char *str2, | 4 | pkey_print_message(const char *str, const char *str2, |
5 | long num, int bits, int sec); | 5 | long num, int bits, int sec); |
6 | static void print_result(int alg, int run_no, int count, double time_used); | 6 | static void print_result(int alg, int run_no, int count, double time_used); |
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #define ALGOR_NUM 32 | 18 | #define ALGOR_NUM 32 |
19 | #define SIZE_NUM 5 | 19 | #define SIZE_NUM 5 |
20 | @@ -466,8 +475,10 @@ | 20 | @@ -466,8 +475,10 @@ speed_main(int argc, char **argv) |
21 | const EVP_CIPHER *evp_cipher = NULL; | 21 | const EVP_CIPHER *evp_cipher = NULL; |
22 | const EVP_MD *evp_md = NULL; | 22 | const EVP_MD *evp_md = NULL; |
23 | int decrypt = 0; | 23 | int decrypt = 0; |
@@ -26,9 +26,9 @@ | |||
26 | const char *errstr = NULL; | 26 | const char *errstr = NULL; |
27 | +#endif | 27 | +#endif |
28 | 28 | ||
29 | if (single_execution) { | 29 | if (pledge("stdio proc", NULL) == -1) { |
30 | if (pledge("stdio proc", NULL) == -1) { | 30 | perror("pledge"); |
31 | @@ -544,6 +555,7 @@ | 31 | @@ -542,6 +553,7 @@ speed_main(int argc, char **argv) |
32 | j--; /* Otherwise, -decrypt gets confused with an | 32 | j--; /* Otherwise, -decrypt gets confused with an |
33 | * algorithm. */ | 33 | * algorithm. */ |
34 | } | 34 | } |
@@ -36,7 +36,7 @@ | |||
36 | else if ((argc > 0) && (strcmp(*argv, "-multi") == 0)) { | 36 | else if ((argc > 0) && (strcmp(*argv, "-multi") == 0)) { |
37 | argc--; | 37 | argc--; |
38 | argv++; | 38 | argv++; |
39 | @@ -559,6 +571,7 @@ | 39 | @@ -557,6 +569,7 @@ speed_main(int argc, char **argv) |
40 | j--; /* Otherwise, -multi gets confused with an | 40 | j--; /* Otherwise, -multi gets confused with an |
41 | * algorithm. */ | 41 | * algorithm. */ |
42 | } | 42 | } |
@@ -44,7 +44,7 @@ | |||
44 | else if (argc > 0 && !strcmp(*argv, "-mr")) { | 44 | else if (argc > 0 && !strcmp(*argv, "-mr")) { |
45 | mr = 1; | 45 | mr = 1; |
46 | j--; /* Otherwise, -mr gets confused with an | 46 | j--; /* Otherwise, -mr gets confused with an |
47 | @@ -921,7 +934,9 @@ | 47 | @@ -919,7 +932,9 @@ speed_main(int argc, char **argv) |
48 | BIO_printf(bio_err, "-evp e use EVP e.\n"); | 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"); | 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"); | 50 | BIO_printf(bio_err, "-mr produce machine readable output.\n"); |
@@ -54,7 +54,7 @@ | |||
54 | goto end; | 54 | goto end; |
55 | } | 55 | } |
56 | argc--; | 56 | argc--; |
57 | @@ -929,8 +944,10 @@ | 57 | @@ -927,8 +942,10 @@ speed_main(int argc, char **argv) |
58 | j++; | 58 | j++; |
59 | } | 59 | } |
60 | 60 | ||
@@ -65,7 +65,7 @@ | |||
65 | 65 | ||
66 | if (j == 0) { | 66 | if (j == 0) { |
67 | for (i = 0; i < ALGOR_NUM; i++) { | 67 | for (i = 0; i < ALGOR_NUM; i++) { |
68 | @@ -1807,7 +1824,9 @@ | 68 | @@ -1805,7 +1822,9 @@ speed_main(int argc, char **argv) |
69 | ecdh_doit[j] = 0; | 69 | ecdh_doit[j] = 0; |
70 | } | 70 | } |
71 | } | 71 | } |
@@ -75,7 +75,7 @@ | |||
75 | if (!mr) { | 75 | if (!mr) { |
76 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); | 76 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); |
77 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); | 77 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); |
78 | @@ -1980,11 +1999,15 @@ | 78 | @@ -1978,11 +1997,15 @@ pkey_print_message(const char *str, const char *str2, |
79 | static void | 79 | static void |
80 | print_result(int alg, int run_no, int count, double time_used) | 80 | print_result(int alg, int run_no, int count, double time_used) |
81 | { | 81 | { |
@@ -91,7 +91,7 @@ | |||
91 | static char * | 91 | static char * |
92 | sstrsep(char **string, const char *delim) | 92 | sstrsep(char **string, const char *delim) |
93 | { | 93 | { |
94 | @@ -2191,4 +2214,5 @@ | 94 | @@ -2189,4 +2212,5 @@ do_multi(int multi) |
95 | free(fds); | 95 | free(fds); |
96 | return 1; | 96 | return 1; |
97 | } | 97 | } |
diff --git a/patches/tlsexttest.c.patch b/patches/tlsexttest.c.patch index bc81da5..c1591d7 100644 --- a/patches/tlsexttest.c.patch +++ b/patches/tlsexttest.c.patch | |||
@@ -1,9 +1,9 @@ | |||
1 | --- tests/tlsexttest.c.orig Mon Sep 5 22:30:36 2022 | 1 | --- tests/tlsexttest.c.orig Tue Nov 8 10:32:18 2022 |
2 | +++ tests/tlsexttest.c Mon Sep 5 22:32:52 2022 | 2 | +++ tests/tlsexttest.c Tue Nov 8 10:35:52 2022 |
3 | @@ -1773,7 +1773,9 @@ static unsigned char tlsext_sni_client[] = { | 3 | @@ -1773,7 +1773,9 @@ static const unsigned char tlsext_sni_client[] = { |
4 | }; | 4 | }; |
5 | 5 | ||
6 | static unsigned char tlsext_sni_server[] = { | 6 | static const unsigned char tlsext_sni_server[] = { |
7 | + 0x00 | 7 | + 0x00 |
8 | }; | 8 | }; |
9 | +const size_t sizeof_tlsext_sni_server = 0; | 9 | +const size_t sizeof_tlsext_sni_server = 0; |
@@ -39,7 +39,7 @@ | |||
39 | if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { | 39 | if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { |
40 | FAIL("failed to parse server SNI\n"); | 40 | FAIL("failed to parse server SNI\n"); |
41 | goto err; | 41 | goto err; |
42 | @@ -3196,7 +3198,10 @@ unsigned char tlsext_clienthello_default[] = { | 42 | @@ -3194,7 +3196,10 @@ unsigned char tlsext_clienthello_default[] = { |
43 | 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, | 43 | 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, |
44 | }; | 44 | }; |
45 | 45 | ||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | static int | 52 | static int |
53 | test_tlsext_clienthello_build(void) | 53 | test_tlsext_clienthello_build(void) |
54 | @@ -3282,18 +3287,18 @@ test_tlsext_clienthello_build(void) | 54 | @@ -3280,18 +3285,18 @@ test_tlsext_clienthello_build(void) |
55 | goto err; | 55 | goto err; |
56 | } | 56 | } |
57 | 57 | ||
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index 0e9428c..17c447d 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch | |||
@@ -13,19 +13,6 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h | |||
13 | 13 | ||
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <stdlib.h> | 15 | #include <stdlib.h> |
16 | --- include/openssl/opensslconf.h.orig Sat Nov 5 08:36:25 2016 | ||
17 | +++ include/openssl/opensslconf.h Mon Jul 17 06:06:58 2017 | ||
18 | @@ -1,6 +1,10 @@ | ||
19 | #include <openssl/opensslfeatures.h> | ||
20 | /* crypto/opensslconf.h.in */ | ||
21 | |||
22 | +#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__) | ||
23 | +#define __attribute__(a) | ||
24 | +#endif | ||
25 | + | ||
26 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | ||
27 | #define OPENSSLDIR "/etc/ssl" | ||
28 | #endif | ||
29 | --- include/openssl/ossl_typ.h.orig Fri Feb 18 16:30:39 2022 | 16 | --- include/openssl/ossl_typ.h.orig Fri Feb 18 16:30:39 2022 |
30 | +++ include/openssl/ossl_typ.h Mon Feb 21 05:39:35 2022 | 17 | +++ include/openssl/ossl_typ.h Mon Feb 21 05:39:35 2022 |
31 | @@ -82,6 +82,22 @@ | 18 | @@ -82,6 +82,22 @@ |