diff options
author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-02 20:44:02 +0000 |
---|---|---|
committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-02 23:39:31 +0000 |
commit | 7e5235f5a858116d1fcbbdbb78a5db401518bc91 (patch) | |
tree | c8dbc38c0d70c72bea31d283a011ab978c5203ac | |
parent | 668e343f49cfda6e4752d5b5ff1b2690da850d4c (diff) | |
download | toolchains-7e5235f5a858116d1fcbbdbb78a5db401518bc91.tar.gz toolchains-7e5235f5a858116d1fcbbdbb78a5db401518bc91.tar.bz2 |
OpenSSL/ppc-amigaos: refresh patches
9 files changed, 93 insertions, 52 deletions
diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p b/sdk/recipes/patches/openssl/apps.speed.c.p index 1ccac30..132d473 100644 --- a/sdk/recipes/patches/openssl/apps.speed.c.p +++ b/sdk/recipes/patches/openssl/apps.speed.c.p @@ -1,5 +1,5 @@ ---- apps/speed.c.orig 2017-11-22 08:07:53.851790744 +0000 -+++ apps/speed.c 2017-11-22 08:15:49.608768064 +0000 +--- apps/speed.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/speed.c 2017-11-21 22:49:21.488219518 +0000 @@ -62,6 +62,12 @@ #include "./testdsa.h" #include <openssl/modes.h> @@ -13,14 +13,22 @@ #ifndef HAVE_FORK # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS) # define HAVE_FORK 0 -@@ -134,8 +240,10 @@ - static double Time_F(int s) - { - double ret = app_tminterval(s, usertime); -+ #ifdef SIGALRM - if (s == STOP) - alarm(0); -+ #endif +@@ -186,6 +192,18 @@ + return ret; } - ++#elif defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) ++static void alarm_aos(unsigned int secs) ++{ ++ (void) secs; ++} ++#define alarm alarm_aos ++ ++static double Time_F(int s) ++{ ++ double ret = app_tminterval(s, usertime); ++ return ret; ++} + #else + # error "SIGALRM not defined and the platform is not Windows" + #endif diff --git a/sdk/recipes/patches/openssl/aps.opt.c.p b/sdk/recipes/patches/openssl/aps.opt.c.p deleted file mode 100644 index 2ba3fba..0000000 --- a/sdk/recipes/patches/openssl/aps.opt.c.p +++ /dev/null @@ -1,14 +0,0 @@ ---- apps/lib/opt.c.orig 2017-11-22 08:42:07.605882648 +0000 -+++ apps/lib/opt.c 2017-11-22 08:48:31.712843519 +0000 -@@ -564,6 +564,11 @@ - defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \ - !defined(OPENSSL_NO_INTTYPES_H) - -+#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) -+# define strtoimax strtol -+# define strtoumax strtoul -+#endif -+ - /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */ - int opt_intmax(const char *value, ossl_intmax_t *result) - { diff --git a/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p new file mode 100644 index 0000000..27f6a9d --- /dev/null +++ b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p @@ -0,0 +1,22 @@ +--- apps/lib/opt.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ apps/lib/opt.c 2017-10-17 15:42:25.304921197 +0100 +@@ -562,7 +562,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ + defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \ +- !defined(OPENSSL_NO_INTTYPES_H) ++ !defined(OPENSSL_NO_INTTYPES_H) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + + /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */ + int opt_intmax(const char *value, ossl_intmax_t *result) +--- test/params_conversion_test.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/params_conversion_test.c 2017-10-17 15:42:25.304921197 +0100 +@@ -15,7 +15,7 @@ + /* On machines that dont support <inttypes.h> just disable the tests */ + #if !defined(OPENSSL_NO_INTTYPES_H) + +-# ifdef OPENSSL_SYS_VMS ++# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + # define strtoumax strtoull + # define strtoimax strtoll + # endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p index dd10e8c..ac14e86 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p @@ -1,6 +1,6 @@ ---- crypto/bio/b_addr.c.orig 2017-11-21 22:49:00.185608040 +0000 -+++ crypto/bio/b_addr.c 2017-11-21 22:49:21.488219518 +0000 -@@ -854,7 +854,7 @@ +--- crypto/bio/bio_addr.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ crypto/bio/bio_addr.c 2017-11-21 22:49:21.488219518 +0000 +@@ -910,7 +910,7 @@ addrlistp++) ; diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p index 56949ca..46d6213 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p @@ -1,15 +1,15 @@ --- crypto/ppccap.c.orig 2017-11-22 13:14:44.655536374 +0000 +++ crypto/ppccap.c 2017-11-22 13:16:03.666387174 +0000 -@@ -135,6 +135,8 @@ - } - #endif +@@ -34,6 +34,8 @@ + + static sigset_t all_masked; +#ifndef OPENSSL_SYS_AMIGAOS4 + static sigjmp_buf ill_jmp; static void ill_handler(int sig) { -@@ -341,3 +343,24 @@ +@@ -309,3 +311,29 @@ sigaction(SIGILL, &ill_oact, NULL); sigprocmask(SIG_SETMASK, &oset, NULL); } @@ -33,4 +33,9 @@ + OPENSSL_ppccap_P |= PPC_ALTIVEC; + } +} ++ ++uint32_t OPENSSL_rdtsc(void) ++{ ++ return 0; ++} +#endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p deleted file mode 100644 index 6ea1ec8..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/include.openssl.e_os2.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- include/openssl/e_os2.h.orig 2017-11-21 23:09:39.684814614 +0000 -+++ include/openssl/e_os2.h 2017-11-21 23:10:32.501369938 +0000 -@@ -223,6 +223,8 @@ - # define OSSL_SSIZE_MAX SSIZE_MAX - # elif defined(_POSIX_SSIZE_MAX) - # define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX -+# else -+# define OSSL_SSIZE_MAX INT_MAX - # endif - # endif - diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p index a5fa68a..969062b 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p @@ -1,14 +1,14 @@ --- test/rsa_complex.c.orig 2019-02-14 10:16:06.665734720 +0000 +++ test/rsa_complex.c 2019-02-14 10:16:18.581682332 +0000 -@@ -12,11 +12,6 @@ - * The former defines "I" as a macro and earlier versions of the latter use - * for function arguments. +@@ -16,11 +16,6 @@ */ --#if defined(__STDC_VERSION__) --# if __STDC_VERSION__ >= 199901L --# include <complex.h> + + #if !defined(__DJGPP__) +-# if defined(__STDC_VERSION__) +-# if __STDC_VERSION__ >= 199901L +-# include <complex.h> +-# endif -# endif --#endif - #include <openssl/rsa.h> + # include <openssl/rsa.h> + #endif #include <stdlib.h> - diff --git a/sdk/recipes/patches/openssl/test.drbgtest.c.p b/sdk/recipes/patches/openssl/test.drbgtest.c.p new file mode 100644 index 0000000..ecf3e81 --- /dev/null +++ b/sdk/recipes/patches/openssl/test.drbgtest.c.p @@ -0,0 +1,20 @@ +--- test/drbgtest.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/drbgtest.c 2017-10-17 15:42:25.304921197 +0100 +@@ -277,7 +277,7 @@ + } + + +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + /* number of children to fork */ + #define DRBG_FORK_COUNT 9 + /* two results per child, two for the parent */ +@@ -895,7 +895,7 @@ + int setup_tests(void) + { + ADD_TEST(test_rand_reseed); +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + ADD_ALL_TESTS(test_rand_fork_safety, RANDOM_SIZE); + #endif + ADD_TEST(test_rand_prediction_resistance); |