aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2022-11-22 18:34:39 +0100
committerTheo Buehler <tb@openbsd.org>2022-11-22 18:34:39 +0100
commit7b66b2d9e652617855908ee5f82f292ae37dbd91 (patch)
tree91b13d76c43c43762ff06d3ee2986d4772e208d6 /patches
parent3d6cab79dd032746bb90a1307dae4c99a8697240 (diff)
downloadportable-7b66b2d9e652617855908ee5f82f292ae37dbd91.tar.gz
portable-7b66b2d9e652617855908ee5f82f292ae37dbd91.tar.bz2
portable-7b66b2d9e652617855908ee5f82f292ae37dbd91.zip
update speed.c.patch
Diffstat (limited to 'patches')
-rw-r--r--patches/speed.c.patch26
1 files changed, 13 insertions, 13 deletions
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 }