diff options
-rw-r--r-- | patches/speed.c.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/patches/speed.c.patch b/patches/speed.c.patch index 87a06bc..fadb3df 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- apps/openssl/speed.c.orig Tue Nov 22 17:32:11 2022 | 1 | --- apps/openssl/speed.c.orig Sun May 21 12:13:46 2023 |
2 | +++ apps/openssl/speed.c Tue Nov 22 18:33:13 2022 | 2 | +++ apps/openssl/speed.c Sun May 21 12:15:49 2023 |
3 | @@ -159,7 +159,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); |
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 @@ speed_main(int argc, char **argv) | 20 | @@ -431,8 +440,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; |
@@ -28,33 +28,33 @@ | |||
28 | 28 | ||
29 | if (pledge("stdio proc", NULL) == -1) { | 29 | if (pledge("stdio proc", NULL) == -1) { |
30 | perror("pledge"); | 30 | perror("pledge"); |
31 | @@ -542,6 +553,7 @@ speed_main(int argc, char **argv) | 31 | @@ -506,6 +517,7 @@ speed_main(int argc, char **argv) |
32 | decrypt = 1; | ||
32 | j--; /* Otherwise, -decrypt gets confused with an | 33 | j--; /* Otherwise, -decrypt gets confused with an |
33 | * algorithm. */ | 34 | * algorithm. */ |
34 | } | ||
35 | +#ifndef _WIN32 | 35 | +#ifndef _WIN32 |
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 | @@ -557,6 +569,7 @@ speed_main(int argc, char **argv) | 39 | @@ -520,6 +532,7 @@ speed_main(int argc, char **argv) |
40 | } | ||
40 | j--; /* Otherwise, -multi gets confused with an | 41 | j--; /* Otherwise, -multi gets confused with an |
41 | * algorithm. */ | 42 | * algorithm. */ |
42 | } | ||
43 | +#endif | 43 | +#endif |
44 | else if (argc > 0 && !strcmp(*argv, "-mr")) { | 44 | } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) { |
45 | mr = 1; | 45 | argc--; |
46 | j--; /* Otherwise, -mr gets confused with an | 46 | argv++; |
47 | @@ -919,7 +932,9 @@ speed_main(int argc, char **argv) | 47 | @@ -855,7 +868,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"); |
51 | +#ifndef _WIN32 | 51 | +#ifndef _WIN32 |
52 | BIO_printf(bio_err, "-multi n run n benchmarks in parallel.\n"); | 52 | BIO_printf(bio_err, "-multi n run n benchmarks in parallel.\n"); |
53 | +#endif | 53 | +#endif |
54 | BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n"); | ||
54 | goto end; | 55 | goto end; |
55 | } | 56 | } |
56 | argc--; | 57 | @@ -864,8 +879,10 @@ speed_main(int argc, char **argv) |
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 | @@ -1805,7 +1822,9 @@ speed_main(int argc, char **argv) | 68 | @@ -1742,7 +1759,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 | @@ -1978,11 +1997,15 @@ pkey_print_message(const char *str, const char *str2, | 78 | @@ -1915,11 +1934,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 | @@ -2189,4 +2212,5 @@ do_multi(int multi) | 94 | @@ -2126,4 +2149,5 @@ do_multi(int multi) |
95 | free(fds); | 95 | free(fds); |
96 | return 1; | 96 | return 1; |
97 | } | 97 | } |