aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2023-05-21 12:32:28 -0600
committerTheo Buehler <tb@openbsd.org>2023-05-21 12:33:22 -0600
commit564ef7e293825830e632ad6f00b9ab2f554a904c (patch)
tree37eb9a80bccbb2547a6741bcf1c307ca9611151b
parentd5556b47c745903bab69ef7a7c411b346851ac78 (diff)
downloadportable-564ef7e293825830e632ad6f00b9ab2f554a904c.tar.gz
portable-564ef7e293825830e632ad6f00b9ab2f554a904c.tar.bz2
portable-564ef7e293825830e632ad6f00b9ab2f554a904c.zip
speed.c: move errstr out of #ifndef
-rw-r--r--patches/speed.c.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/patches/speed.c.patch b/patches/speed.c.patch
index fadb3df..3baf9f2 100644
--- a/patches/speed.c.patch
+++ b/patches/speed.c.patch
@@ -1,5 +1,5 @@
1--- apps/openssl/speed.c.orig Sun May 21 12:13:46 2023 1--- apps/openssl/speed.c.orig Sun May 21 12:13:46 2023
2+++ apps/openssl/speed.c Sun May 21 12:15:49 2023 2+++ apps/openssl/speed.c Sun May 21 12:31:50 2023
3@@ -161,7 +161,16 @@ static void 3@@ -161,7 +161,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);
@@ -17,17 +17,16 @@
17 17
18 #define ALGOR_NUM 32 18 #define ALGOR_NUM 32
19 #define SIZE_NUM 5 19 #define SIZE_NUM 5
20@@ -431,8 +440,10 @@ speed_main(int argc, char **argv) 20@@ -431,7 +440,9 @@ 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;
24+#ifndef _WIN32 24+#ifndef _WIN32
25 int multi = 0; 25 int multi = 0;
26 const char *errstr = NULL;
27+#endif 26+#endif
27 const char *errstr = NULL;
28 28
29 if (pledge("stdio proc", NULL) == -1) { 29 if (pledge("stdio proc", NULL) == -1) {
30 perror("pledge");
31@@ -506,6 +517,7 @@ speed_main(int argc, char **argv) 30@@ -506,6 +517,7 @@ speed_main(int argc, char **argv)
32 decrypt = 1; 31 decrypt = 1;
33 j--; /* Otherwise, -decrypt gets confused with an 32 j--; /* Otherwise, -decrypt gets confused with an