diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-12-14 13:52:30 -0700 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-12-14 13:59:12 -0700 |
| commit | 74cd742cf561c2c24a0d0ad3a0e7d55779649e87 (patch) | |
| tree | fa9df6a255b5dbb84b8d6a0058db5e7fc67d5073 | |
| parent | 08207128cece13bd849c4c2206ab0b2a8338e790 (diff) | |
| download | portable-74cd742cf561c2c24a0d0ad3a0e7d55779649e87.tar.gz portable-74cd742cf561c2c24a0d0ad3a0e7d55779649e87.tar.bz2 portable-74cd742cf561c2c24a0d0ad3a0e7d55779649e87.zip | |
Update speed patch
| -rw-r--r-- | patches/speed.c.patch | 24 |
1 files 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 @@ | |||
| 1 | --- apps/openssl/speed.c.orig Sat Jul 13 11:02:51 2024 | 1 | --- apps/openssl/speed.c.orig Sat Dec 14 13:45:20 2024 |
| 2 | +++ apps/openssl/speed.c Sat Jul 13 10:27:25 2024 | 2 | +++ apps/openssl/speed.c Sat Dec 14 13:46:47 2024 |
| 3 | @@ -161,7 +161,16 @@ | 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 | @@ -430,8 +439,10 @@ | 20 | @@ -424,8 +433,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,7 +28,7 @@ | |||
| 28 | const char *errstr = NULL; | 28 | const char *errstr = NULL; |
| 29 | 29 | ||
| 30 | if (pledge("stdio proc", NULL) == -1) { | 30 | if (pledge("stdio proc", NULL) == -1) { |
| 31 | @@ -506,6 +517,7 @@ | 31 | @@ -500,6 +511,7 @@ speed_main(int argc, char **argv) |
| 32 | decrypt = 1; | 32 | decrypt = 1; |
| 33 | j--; /* Otherwise, -decrypt gets confused with an | 33 | j--; /* Otherwise, -decrypt gets confused with an |
| 34 | * algorithm. */ | 34 | * algorithm. */ |
| @@ -36,7 +36,7 @@ | |||
| 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 | @@ -520,6 +532,7 @@ | 39 | @@ -514,6 +526,7 @@ speed_main(int argc, char **argv) |
| 40 | } | 40 | } |
| 41 | j--; /* Otherwise, -multi gets confused with an | 41 | j--; /* Otherwise, -multi gets confused with an |
| 42 | * algorithm. */ | 42 | * algorithm. */ |
| @@ -44,7 +44,7 @@ | |||
| 44 | } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) { | 44 | } else if (argc > 0 && strcmp(*argv, "-unaligned") == 0) { |
| 45 | argc--; | 45 | argc--; |
| 46 | argv++; | 46 | argv++; |
| 47 | @@ -851,7 +864,9 @@ | 47 | @@ -837,7 +850,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"); |
| @@ -54,7 +54,7 @@ | |||
| 54 | BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n"); | 54 | BIO_printf(bio_err, "-unaligned n use buffers with offset n from proper alignment.\n"); |
| 55 | goto end; | 55 | goto end; |
| 56 | } | 56 | } |
| 57 | @@ -860,8 +875,10 @@ | 57 | @@ -846,8 +861,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 | @@ -933,11 +950,13 @@ | 68 | @@ -919,11 +936,13 @@ speed_main(int argc, char **argv) |
| 69 | #define COND(c) (run && count<0x7fffffff) | 69 | #define COND(c) (run && count<0x7fffffff) |
| 70 | #define COUNT(d) (count) | 70 | #define COUNT(d) (count) |
| 71 | 71 | ||
| @@ -79,7 +79,7 @@ | |||
| 79 | 79 | ||
| 80 | #ifndef OPENSSL_NO_MD4 | 80 | #ifndef OPENSSL_NO_MD4 |
| 81 | if (doit[D_MD4]) { | 81 | if (doit[D_MD4]) { |
| 82 | @@ -1743,7 +1762,9 @@ | 82 | @@ -1729,7 +1748,9 @@ speed_main(int argc, char **argv) |
| 83 | ecdh_doit[j] = 0; | 83 | ecdh_doit[j] = 0; |
| 84 | } | 84 | } |
| 85 | } | 85 | } |
| @@ -89,7 +89,7 @@ | |||
| 89 | if (!mr) { | 89 | if (!mr) { |
| 90 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); | 90 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION)); |
| 91 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); | 91 | fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON)); |
| 92 | @@ -1899,11 +1920,15 @@ | 92 | @@ -1885,11 +1906,15 @@ pkey_print_message(const char *str, const char *str2, |
| 93 | static void | 93 | static void |
| 94 | print_result(int alg, int run_no, int count, double time_used) | 94 | print_result(int alg, int run_no, int count, double time_used) |
| 95 | { | 95 | { |
| @@ -105,7 +105,7 @@ | |||
| 105 | static char * | 105 | static char * |
| 106 | sstrsep(char **string, const char *delim) | 106 | sstrsep(char **string, const char *delim) |
| 107 | { | 107 | { |
| 108 | @@ -2104,4 +2129,5 @@ | 108 | @@ -2090,4 +2115,5 @@ do_multi(int multi) |
| 109 | free(fds); | 109 | free(fds); |
| 110 | return 1; | 110 | return 1; |
| 111 | } | 111 | } |
