diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index 810408d517..ee1b65b2bb 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am @@ -88,11 +88,6 @@ endif endif noinst_HEADERS = apps.h -noinst_HEADERS += progs.h -noinst_HEADERS += s_apps.h -noinst_HEADERS += testdsa.h -noinst_HEADERS += testrsa.h -noinst_HEADERS += timeouts.h EXTRA_DIST = CMakeLists.txt diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch index 4e0887c39e..5ba5ac6664 100644 --- a/patches/openssl.c.patch +++ b/patches/openssl.c.patch @@ -1,6 +1,6 @@ ---- apps/openssl/openssl.c.orig Fri Aug 2 23:52:59 2024 -+++ apps/openssl/openssl.c Fri Aug 2 23:53:17 2024 -@@ -347,7 +347,9 @@ BIO *bio_err = NULL; +--- apps/openssl/openssl.c.orig Thu Jan 2 08:27:54 2025 ++++ apps/openssl/openssl.c Thu Jan 2 08:28:04 2025 +@@ -344,7 +344,9 @@ BIO *bio_err = NULL; static void openssl_startup(void) { diff --git a/patches/speed.c.patch b/patches/speed.c.patch index 8c79e0b587..e1f1698154 100644 --- a/patches/speed.c.patch +++ b/patches/speed.c.patch @@ -1,6 +1,6 @@ ---- apps/openssl/speed.c.orig Sat Dec 14 13:45:20 2024 -+++ apps/openssl/speed.c Sat Dec 14 13:46:47 2024 -@@ -161,7 +161,16 @@ static void +--- 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 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); @@ -17,7 +17,7 @@ #define ALGOR_NUM 32 #define SIZE_NUM 5 -@@ -424,8 +433,10 @@ speed_main(int argc, char **argv) +@@ -1129,8 +1138,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) { -@@ -500,6 +511,7 @@ speed_main(int argc, char **argv) +@@ -1205,6 +1216,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++; -@@ -514,6 +526,7 @@ speed_main(int argc, char **argv) +@@ -1219,6 +1231,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++; -@@ -837,7 +850,9 @@ speed_main(int argc, char **argv) +@@ -1542,7 +1555,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; } -@@ -846,8 +861,10 @@ speed_main(int argc, char **argv) +@@ -1551,8 +1566,10 @@ speed_main(int argc, char **argv) j++; } @@ -65,7 +65,7 @@ if (j == 0) { for (i = 0; i < ALGOR_NUM; i++) { -@@ -919,11 +936,13 @@ speed_main(int argc, char **argv) +@@ -1624,11 +1641,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]) { -@@ -1729,7 +1748,9 @@ speed_main(int argc, char **argv) +@@ -2434,7 +2453,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)); -@@ -1885,11 +1906,15 @@ pkey_print_message(const char *str, const char *str2, +@@ -2590,11 +2611,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,9 +105,10 @@ static char * sstrsep(char **string, const char *delim) { -@@ -2090,4 +2115,5 @@ do_multi(int multi) +@@ -2795,5 +2820,6 @@ do_multi(int multi) free(fds); return 1; } +#endif - #endif + + #endif /* OPENSSL_NO_SPEED */