From 74cd742cf561c2c24a0d0ad3a0e7d55779649e87 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sat, 14 Dec 2024 13:52:30 -0700 Subject: Update speed patch --- patches/speed.c.patch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/speed.c.patch b/patches/speed.c.patch index c29ef4d..8c79e0b 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch @@ -1,6 +1,6 @@ ---- apps/openssl/speed.c.orig Sat Jul 13 11:02:51 2024 -+++ apps/openssl/speed.c Sat Jul 13 10:27:25 2024 -@@ -161,7 +161,16 @@ +--- apps/openssl/speed.c.orig Sat Dec 14 13:45:20 2024 ++++ apps/openssl/speed.c Sat Dec 14 13:46:47 2024 +@@ -161,7 +161,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 -@@ -430,8 +439,10 @@ +@@ -424,8 +433,10 @@ speed_main(int argc, char **argv) const EVP_CIPHER *evp_cipher = NULL; const EVP_MD *evp_md = NULL; int decrypt = 0; @@ -28,7 +28,7 @@ const char *errstr = NULL; if (pledge("stdio proc", NULL) == -1) { -@@ -506,6 +517,7 @@ +@@ -500,6 +511,7 @@ speed_main(int argc, char **argv) decrypt = 1; j--; /* Otherwise, -decrypt gets confused with an * algorithm. */ @@ -36,7 +36,7 @@ } else if (argc > 0 && strcmp(*argv, "-multi") == 0) { argc--; argv++; -@@ -520,6 +532,7 @@ +@@ -514,6 +526,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, "-unaligned") == 0) { argc--; argv++; -@@ -851,7 +864,9 @@ +@@ -837,7 +850,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 @@ BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n"); goto end; } -@@ -860,8 +875,10 @@ +@@ -846,8 +861,10 @@ speed_main(int argc, char **argv) j++; } @@ -65,7 +65,7 @@ if (j == 0) { for (i = 0; i < ALGOR_NUM; i++) { -@@ -933,11 +950,13 @@ +@@ -919,11 +936,13 @@ speed_main(int argc, char **argv) #define COND(c) (run && count<0x7fffffff) #define COUNT(d) (count) @@ -79,7 +79,7 @@ #ifndef OPENSSL_NO_MD4 if (doit[D_MD4]) { -@@ -1743,7 +1762,9 @@ +@@ -1729,7 +1748,9 @@ speed_main(int argc, char **argv) ecdh_doit[j] = 0; } } @@ -89,7 +89,7 @@ if (!mr) { fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); -@@ -1899,11 +1920,15 @@ +@@ -1885,11 +1906,15 @@ pkey_print_message(const char *str, const char *str2, static void print_result(int alg, int run_no, int count, double time_used) { @@ -105,7 +105,7 @@ static char * sstrsep(char **string, const char *delim) { -@@ -2104,4 +2129,5 @@ +@@ -2090,4 +2115,5 @@ do_multi(int multi) free(fds); return 1; } -- cgit v1.2.3-55-g6feb