diff options
| author | Theo Buehler <tb@openbsd.org> | 2025-12-18 07:45:54 -0700 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2025-12-18 07:47:07 -0700 |
| commit | b31ec29518de245a15499e8249091b0d2d8425e3 (patch) | |
| tree | 916b4b98df1839c39e558b659bc38113f2b5c6bd | |
| parent | 2ec151e4ce3e74a9b3614a86ef034a35639fb3ab (diff) | |
| download | portable-b31ec29518de245a15499e8249091b0d2d8425e3.tar.gz portable-b31ec29518de245a15499e8249091b0d2d8425e3.tar.bz2 portable-b31ec29518de245a15499e8249091b0d2d8425e3.zip | |
refresh patches
| -rw-r--r-- | patches/speed.c.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/patches/speed.c.patch b/patches/speed.c.patch index 32e42b4..0f29358 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | --- apps/openssl/speed.c.orig Sat May 31 03:18:05 2025 | 1 | --- apps/openssl/speed.c.orig Thu Dec 18 07:45:00 2025 |
| 2 | +++ apps/openssl/speed.c Sat May 31 03:18:17 2025 | 2 | +++ apps/openssl/speed.c Thu Dec 18 07:45:12 2025 |
| 3 | @@ -154,7 +154,16 @@ static void | 3 | @@ -154,7 +154,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 | 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); |
| 7 | +#ifndef _WIN32 | 7 | +#ifndef _WIN32 |
| 8 | static int do_multi(int multi); | 8 | static int do_multi(int multi); |
| @@ -15,9 +15,9 @@ | |||
| 15 | +#define alarm(seconds) speed_alarm((seconds)) | 15 | +#define alarm(seconds) speed_alarm((seconds)) |
| 16 | +#endif | 16 | +#endif |
| 17 | 17 | ||
| 18 | #define ALGOR_NUM 31 | ||
| 19 | #define SIZE_NUM 5 | 18 | #define SIZE_NUM 5 |
| 20 | @@ -1087,8 +1096,10 @@ speed_main(int argc, char **argv) | 19 | #define MAX_ECDH_SIZE 256 |
| 20 | @@ -1089,8 +1098,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 | @@ -1163,6 +1174,7 @@ speed_main(int argc, char **argv) | 31 | @@ -1164,6 +1175,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 | @@ -1177,6 +1189,7 @@ speed_main(int argc, char **argv) | 39 | @@ -1178,6 +1190,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 | @@ -1491,7 +1504,9 @@ speed_main(int argc, char **argv) | 47 | @@ -1492,7 +1505,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 | @@ -1500,8 +1515,10 @@ speed_main(int argc, char **argv) | 57 | @@ -1501,8 +1516,10 @@ speed_main(int argc, char **argv) |
| 58 | j++; | 58 | j++; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| @@ -66,7 +66,7 @@ | |||
| 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 | @@ -1573,11 +1590,13 @@ speed_main(int argc, char **argv) | 68 | @@ -1573,11 +1590,13 @@ speed_main(int argc, char **argv) |
| 69 | #define COND(c) (run && count<0x7fffffff) | 69 | #define COND (run && count<0x7fffffff) |
| 70 | #define COUNT(d) (count) | 70 | #define COUNT(d) (count) |
| 71 | 71 | ||
| 72 | +#ifndef _WIN32 | 72 | +#ifndef _WIN32 |
| @@ -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 | @@ -2370,7 +2389,9 @@ speed_main(int argc, char **argv) | 82 | @@ -2362,7 +2381,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 | @@ -2526,11 +2547,15 @@ pkey_print_message(const char *str, const char *str2, | 92 | @@ -2518,11 +2539,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 | @@ -2731,5 +2756,6 @@ do_multi(int multi) | 108 | @@ -2723,5 +2748,6 @@ do_multi(int multi) |
| 109 | free(fds); | 109 | free(fds); |
| 110 | return 1; | 110 | return 1; |
| 111 | } | 111 | } |
