From 7b66b2d9e652617855908ee5f82f292ae37dbd91 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Tue, 22 Nov 2022 18:34:39 +0100
Subject: update speed.c.patch

---
 patches/speed.c.patch | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'patches')

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 @@
---- apps/openssl/speed.c.orig	Sun Feb  6 20:37:16 2022
-+++ apps/openssl/speed.c	Sun Feb  6 21:07:42 2022
-@@ -159,7 +159,16 @@
+--- apps/openssl/speed.c.orig	Tue Nov 22 17:32:11 2022
++++ apps/openssl/speed.c	Tue Nov 22 18:33:13 2022
+@@ -159,7 +159,16 @@ static void
  pkey_print_message(const char *str, const char *str2,
      long num, int bits, int sec);
  static void print_result(int alg, int run_no, int count, double time_used);
@@ -17,7 +17,7 @@
  
  #define ALGOR_NUM	32
  #define SIZE_NUM	5
-@@ -466,8 +475,10 @@
+@@ -466,8 +475,10 @@ speed_main(int argc, char **argv)
  	const EVP_CIPHER *evp_cipher = NULL;
  	const EVP_MD *evp_md = NULL;
  	int decrypt = 0;
@@ -26,9 +26,9 @@
  	const char *errstr = NULL;
 +#endif
  
- 	if (single_execution) {
- 		if (pledge("stdio proc", NULL) == -1) {
-@@ -544,6 +555,7 @@
+ 	if (pledge("stdio proc", NULL) == -1) {
+ 		perror("pledge");
+@@ -542,6 +553,7 @@ speed_main(int argc, char **argv)
  			j--;	/* Otherwise, -decrypt gets confused with an
  				 * algorithm. */
  		}
@@ -36,7 +36,7 @@
  		else if ((argc > 0) && (strcmp(*argv, "-multi") == 0)) {
  			argc--;
  			argv++;
-@@ -559,6 +571,7 @@
+@@ -557,6 +569,7 @@ speed_main(int argc, char **argv)
  			j--;	/* Otherwise, -multi gets confused with an
  				 * algorithm. */
  		}
@@ -44,7 +44,7 @@
  		else if (argc > 0 && !strcmp(*argv, "-mr")) {
  			mr = 1;
  			j--;	/* Otherwise, -mr gets confused with an
-@@ -921,7 +934,9 @@
+@@ -919,7 +932,9 @@ speed_main(int argc, char **argv)
  			BIO_printf(bio_err, "-evp e          use EVP e.\n");
  			BIO_printf(bio_err, "-decrypt        time decryption instead of encryption (only EVP).\n");
  			BIO_printf(bio_err, "-mr             produce machine readable output.\n");
@@ -54,7 +54,7 @@
  			goto end;
  		}
  		argc--;
-@@ -929,8 +944,10 @@
+@@ -927,8 +942,10 @@ speed_main(int argc, char **argv)
  		j++;
  	}
  
@@ -65,7 +65,7 @@
  
  	if (j == 0) {
  		for (i = 0; i < ALGOR_NUM; i++) {
-@@ -1807,7 +1824,9 @@
+@@ -1805,7 +1822,9 @@ speed_main(int argc, char **argv)
  				ecdh_doit[j] = 0;
  		}
  	}
@@ -75,7 +75,7 @@
  	if (!mr) {
  		fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION));
  		fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-@@ -1980,11 +1999,15 @@
+@@ -1978,11 +1997,15 @@ pkey_print_message(const char *str, const char *str2, 
  static void
  print_result(int alg, int run_no, int count, double time_used)
  {
@@ -91,7 +91,7 @@
  static char *
  sstrsep(char **string, const char *delim)
  {
-@@ -2191,4 +2214,5 @@
+@@ -2189,4 +2212,5 @@ do_multi(int multi)
  	free(fds);
  	return 1;
  }
-- 
cgit v1.2.3-55-g6feb