From 360c36c195a3f2f86638be01777529b89014b353 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sat, 31 May 2025 03:19:12 -0600 Subject: regen speed.c patch --- patches/speed.c.patch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/speed.c.patch b/patches/speed.c.patch index e1f1698..32e42b4 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch @@ -1,6 +1,6 @@ ---- apps/openssl/speed.c.orig Thu Jan 2 08:04:28 2025 -+++ apps/openssl/speed.c Thu Jan 2 08:04:38 2025 -@@ -158,7 +158,16 @@ static void +--- apps/openssl/speed.c.orig Sat May 31 03:18:05 2025 ++++ apps/openssl/speed.c Sat May 31 03:18:17 2025 +@@ -154,7 +154,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); @@ -15,9 +15,9 @@ +#define alarm(seconds) speed_alarm((seconds)) +#endif - #define ALGOR_NUM 32 + #define ALGOR_NUM 31 #define SIZE_NUM 5 -@@ -1129,8 +1138,10 @@ speed_main(int argc, char **argv) +@@ -1087,8 +1096,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) { -@@ -1205,6 +1216,7 @@ speed_main(int argc, char **argv) +@@ -1163,6 +1174,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++; -@@ -1219,6 +1231,7 @@ speed_main(int argc, char **argv) +@@ -1177,6 +1189,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++; -@@ -1542,7 +1555,9 @@ speed_main(int argc, char **argv) +@@ -1491,7 +1504,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; } -@@ -1551,8 +1566,10 @@ speed_main(int argc, char **argv) +@@ -1500,8 +1515,10 @@ speed_main(int argc, char **argv) j++; } @@ -65,7 +65,7 @@ if (j == 0) { for (i = 0; i < ALGOR_NUM; i++) { -@@ -1624,11 +1641,13 @@ speed_main(int argc, char **argv) +@@ -1573,11 +1590,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]) { -@@ -2434,7 +2453,9 @@ speed_main(int argc, char **argv) +@@ -2370,7 +2389,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)); -@@ -2590,11 +2611,15 @@ pkey_print_message(const char *str, const char *str2, +@@ -2526,11 +2547,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) { -@@ -2795,5 +2820,6 @@ do_multi(int multi) +@@ -2731,5 +2756,6 @@ do_multi(int multi) free(fds); return 1; } -- cgit v1.2.3-55-g6feb