mirror of
https://github.com/libressl/portable.git
synced 2026-01-17 21:51:17 +01:00
refresh patches
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
--- apps/openssl/speed.c.orig Sat May 31 03:18:05 2025
|
||||
+++ apps/openssl/speed.c Sat May 31 03:18:17 2025
|
||||
--- apps/openssl/speed.c.orig Thu Dec 18 07:45:00 2025
|
||||
+++ apps/openssl/speed.c Thu Dec 18 07:45:12 2025
|
||||
@@ -154,7 +154,16 @@ static void
|
||||
pkey_print_message(const char *str, const char *str2,
|
||||
long num, int bits, int sec);
|
||||
int bits, int sec);
|
||||
static void print_result(int alg, int run_no, int count, double time_used);
|
||||
+#ifndef _WIN32
|
||||
static int do_multi(int multi);
|
||||
@@ -15,9 +15,9 @@
|
||||
+#define alarm(seconds) speed_alarm((seconds))
|
||||
+#endif
|
||||
|
||||
#define ALGOR_NUM 31
|
||||
#define SIZE_NUM 5
|
||||
@@ -1087,8 +1096,10 @@ speed_main(int argc, char **argv)
|
||||
#define MAX_ECDH_SIZE 256
|
||||
@@ -1089,8 +1098,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) {
|
||||
@@ -1163,6 +1174,7 @@ speed_main(int argc, char **argv)
|
||||
@@ -1164,6 +1175,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++;
|
||||
@@ -1177,6 +1189,7 @@ speed_main(int argc, char **argv)
|
||||
@@ -1178,6 +1190,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++;
|
||||
@@ -1491,7 +1504,9 @@ speed_main(int argc, char **argv)
|
||||
@@ -1492,7 +1505,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;
|
||||
}
|
||||
@@ -1500,8 +1515,10 @@ speed_main(int argc, char **argv)
|
||||
@@ -1501,8 +1516,10 @@ speed_main(int argc, char **argv)
|
||||
j++;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
if (j == 0) {
|
||||
for (i = 0; i < ALGOR_NUM; i++) {
|
||||
@@ -1573,11 +1590,13 @@ speed_main(int argc, char **argv)
|
||||
#define COND(c) (run && count<0x7fffffff)
|
||||
#define COND (run && count<0x7fffffff)
|
||||
#define COUNT(d) (count)
|
||||
|
||||
+#ifndef _WIN32
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
if (doit[D_MD4]) {
|
||||
@@ -2370,7 +2389,9 @@ speed_main(int argc, char **argv)
|
||||
@@ -2362,7 +2381,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));
|
||||
@@ -2526,11 +2547,15 @@ pkey_print_message(const char *str, const char *str2,
|
||||
@@ -2518,11 +2539,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)
|
||||
{
|
||||
@@ -2731,5 +2756,6 @@ do_multi(int multi)
|
||||
@@ -2723,5 +2748,6 @@ do_multi(int multi)
|
||||
free(fds);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user