aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2025-01-02 08:11:30 -0700
committerTheo Buehler <tb@openbsd.org>2025-01-02 08:29:09 -0700
commit8dad5fe3b9ed8f3e5fb468a98c8459769862bb35 (patch)
tree8e64c705764ae8f7633df769706653632eaa8875 /patches
parentfeb5a0da1e50a9dca1678d02e16704ed9516853c (diff)
downloadportable-8dad5fe3b9ed8f3e5fb468a98c8459769862bb35.tar.gz
portable-8dad5fe3b9ed8f3e5fb468a98c8459769862bb35.tar.bz2
portable-8dad5fe3b9ed8f3e5fb468a98c8459769862bb35.zip
Update for speed.c and .h churn
Diffstat (limited to 'patches')
-rw-r--r--patches/openssl.c.patch6
-rw-r--r--patches/speed.c.patch27
2 files changed, 17 insertions, 16 deletions
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index 4e0887c..5ba5ac6 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
1--- apps/openssl/openssl.c.orig Fri Aug 2 23:52:59 2024 1--- apps/openssl/openssl.c.orig Thu Jan 2 08:27:54 2025
2+++ apps/openssl/openssl.c Fri Aug 2 23:53:17 2024 2+++ apps/openssl/openssl.c Thu Jan 2 08:28:04 2025
3@@ -347,7 +347,9 @@ BIO *bio_err = NULL; 3@@ -344,7 +344,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/speed.c.patch b/patches/speed.c.patch
index 8c79e0b..e1f1698 100644
--- a/patches/speed.c.patch
+++ b/patches/speed.c.patch
@@ -1,6 +1,6 @@
1--- apps/openssl/speed.c.orig Sat Dec 14 13:45:20 2024 1--- apps/openssl/speed.c.orig Thu Jan 2 08:04:28 2025
2+++ apps/openssl/speed.c Sat Dec 14 13:46:47 2024 2+++ apps/openssl/speed.c Thu Jan 2 08:04:38 2025
3@@ -161,7 +161,16 @@ static void 3@@ -158,7 +158,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@@ -424,8 +433,10 @@ speed_main(int argc, char **argv) 20@@ -1129,8 +1138,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;
@@ -28,7 +28,7 @@
28 const char *errstr = NULL; 28 const char *errstr = NULL;
29 29
30 if (pledge("stdio proc", NULL) == -1) { 30 if (pledge("stdio proc", NULL) == -1) {
31@@ -500,6 +511,7 @@ speed_main(int argc, char **argv) 31@@ -1205,6 +1216,7 @@ speed_main(int argc, char **argv)
32 decrypt = 1; 32 decrypt = 1;
33 j--; /* Otherwise, -decrypt gets confused with an 33 j--; /* Otherwise, -decrypt gets confused with an
34 * algorithm. */ 34 * algorithm. */
@@ -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@@ -514,6 +526,7 @@ speed_main(int argc, char **argv) 39@@ -1219,6 +1231,7 @@ speed_main(int argc, char **argv)
40 } 40 }
41 j--; /* Otherwise, -multi gets confused with an 41 j--; /* Otherwise, -multi gets confused with an
42 * algorithm. */ 42 * algorithm. */
@@ -44,7 +44,7 @@
44 } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) { 44 } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) {
45 argc--; 45 argc--;
46 argv++; 46 argv++;
47@@ -837,7 +850,9 @@ speed_main(int argc, char **argv) 47@@ -1542,7 +1555,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 BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n"); 54 BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n");
55 goto end; 55 goto end;
56 } 56 }
57@@ -846,8 +861,10 @@ speed_main(int argc, char **argv) 57@@ -1551,8 +1566,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@@ -919,11 +936,13 @@ speed_main(int argc, char **argv) 68@@ -1624,11 +1641,13 @@ speed_main(int argc, char **argv)
69 #define COND(c) (run && count<0x7fffffff) 69 #define COND(c) (run && count<0x7fffffff)
70 #define COUNT(d) (count) 70 #define COUNT(d) (count)
71 71
@@ -79,7 +79,7 @@
79 79
80 #ifndef OPENSSL_NO_MD4 80 #ifndef OPENSSL_NO_MD4
81 if (doit[D_MD4]) { 81 if (doit[D_MD4]) {
82@@ -1729,7 +1748,9 @@ speed_main(int argc, char **argv) 82@@ -2434,7 +2453,9 @@ speed_main(int argc, char **argv)
83 ecdh_doit[j] = 0; 83 ecdh_doit[j] = 0;
84 } 84 }
85 } 85 }
@@ -89,7 +89,7 @@
89 if (!mr) { 89 if (!mr) {
90 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); 90 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION));
91 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); 91 fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
92@@ -1885,11 +1906,15 @@ pkey_print_message(const char *str, const char *str2, 92@@ -2590,11 +2611,15 @@ pkey_print_message(const char *str, const char *str2,
93 static void 93 static void
94 print_result(int alg, int run_no, int count, double time_used) 94 print_result(int alg, int run_no, int count, double time_used)
95 { 95 {
@@ -105,9 +105,10 @@
105 static char * 105 static char *
106 sstrsep(char **string, const char *delim) 106 sstrsep(char **string, const char *delim)
107 { 107 {
108@@ -2090,4 +2115,5 @@ do_multi(int multi) 108@@ -2795,5 +2820,6 @@ do_multi(int multi)
109 free(fds); 109 free(fds);
110 return 1; 110 return 1;
111 } 111 }
112+#endif 112+#endif
113 #endif 113
114 #endif /* OPENSSL_NO_SPEED */