mingw-w64-openssl: update to 3.5.3

Signed-off-by: Matthias Aßhauer <[email protected]>

Author: rimrul

mingw-w64-openssl/002-relocation.patch

@@ -1,11 +1,11 @@
 --- a/crypto/build.info
 +++ b/crypto/build.info
 @@ -107,7 +107,7 @@
-         cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \
-         o_fopen.c getenv.c o_init.c init.c trace.c provider.c provider_child.c \
-         punycode.c passphrase.c sleep.c deterministic_nonce.c quic_vlint.c \
--        time.c
-+        time.c pathtools.c
+         comp_methods.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c \
+         o_dir.c o_fopen.c getenv.c o_init.c init.c trace.c provider.c \
+         provider_child.c punycode.c passphrase.c sleep.c deterministic_nonce.c \
+-        quic_vlint.c time.c defaults.c ssl_err.c
++        quic_vlint.c time.c defaults.c ssl_err.c pathtools.c
  SOURCE[../providers/libfips.a]=$UTIL_COMMON
 
  SOURCE[../libcrypto]=$UPLINKSRC
@@ -24,11 +24,11 @@
       */
      if (strcmp(id, "dynamic")) {
 -        if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL)
--            load_dir = ENGINESDIR;
+-            load_dir = ossl_get_enginesdir();
 +        if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL) {
 +            static char * reloc = NULL;
 +            if (reloc == NULL) {
-+                reloc = single_path_relocation_lib(OPENSSLBIN, ENGINESDIR);
++                reloc = single_path_relocation_lib(OPENSSLBIN, ossl_get_enginesdir());
 +            }
 +            load_dir = reloc;
 +        }
@@ -37,55 +37,38 @@
              !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
 --- a/crypto/x509/x509_def.c
 +++ b/crypto/x509/x509_def.c
-@@ -9,27 +9,44 @@
- 
+@@ -10,6 +10,7 @@
  #include <stdio.h>
+ #include "internal/e_os.h"
  #include "internal/cryptlib.h"
 +#include "pathtools.h"
+ #include "internal/thread_once.h"
  #include <openssl/crypto.h>
- #include <openssl/x509.h>
- 
- const char *X509_get_default_private_dir(void)
+ #include <openssl/x509.h> 
+@@ -47,19 +48,19 @@
  {
--    return X509_PRIVATE_DIR;
-+    static char * reloc = NULL;
-+    if (reloc == NULL) {
-+        reloc = single_path_relocation_lib(OPENSSLBIN, X509_PRIVATE_DIR);
-+    }
-+    return reloc;
- }
+     get_windows_default_path(x509_private_dir, "\\private");
+     if (strlen(x509_private_dir) > 0)
+-        x509_private_dirptr = x509_private_dir;
++        x509_private_dirptr = single_path_relocation_lib(OPENSSLBIN, x509_private_dir);
 
- const char *X509_get_default_cert_area(void)
- {
--    return X509_CERT_AREA;
-+    static char * reloc = NULL;
-+    if (reloc == NULL) {
-+        reloc = single_path_relocation_lib(OPENSSLBIN, X509_CERT_AREA);
-+    }
-+    return reloc;
- }
+     get_windows_default_path(x509_cert_area, "\\");
+     if (strlen(x509_cert_area) > 0)
+-        x509_cert_areaptr = x509_cert_area;
++        x509_cert_areaptr = single_path_relocation_lib(OPENSSLBIN, x509_cert_area);
 
- const char *X509_get_default_cert_dir(void)
- {
--    return X509_CERT_DIR;
-+    static char * reloc = NULL;
-+    if (reloc == NULL) {
-+        reloc = single_path_relocation_lib(OPENSSLBIN, X509_CERT_DIR);
-+    }
-+    return reloc;
- }
+     get_windows_default_path(x509_cert_dir, "\\certs");
+     if (strlen(x509_cert_dir) > 0)
+-        x509_cert_dirptr = x509_cert_dir;
++        x509_cert_dirptr = single_path_relocation_lib(OPENSSLBIN, x509_cert_dir);
 
- const char *X509_get_default_cert_file(void)
- {
--    return X509_CERT_FILE;
-+    static char * reloc = NULL;
-+    if (reloc == NULL) {
-+        reloc = single_path_relocation_lib(OPENSSLBIN, X509_CERT_FILE);
-+    }
-+    return reloc;
- }
+     get_windows_default_path(x509_cert_file, "\\cert.pem");
+     if (strlen(x509_cert_file) > 0)
+-        x509_cert_fileptr = x509_cert_file;
++        x509_cert_fileptr = single_path_relocation_lib(OPENSSLBIN, x509_cert_file);
 
- const char *X509_get_default_cert_dir_env(void)
+     return 1;
+ }
 --- a/crypto/provider_core.c
 +++ b/crypto/provider_core.c
 @@ -30,6 +30,7 @@
@@ -96,16 +79,16 @@
  #ifndef FIPS_MODULE
  # include <openssl/self_test.h>
  #endif
-@@ -916,8 +917,13 @@
- 
+@@ -989,8 +990,13 @@
+
              if (load_dir == NULL) {
                  load_dir = ossl_safe_getenv("OPENSSL_MODULES");
 -                if (load_dir == NULL)
--                    load_dir = MODULESDIR;
+-                    load_dir = ossl_get_modulesdir();
 +                if (load_dir == NULL) {
 +                    static char * reloc = NULL;
 +                    if (reloc == NULL) {
-+                        reloc = single_path_relocation_lib(OPENSSLBIN, MODULESDIR);
++                        reloc = single_path_relocation_lib(OPENSSLBIN, ossl_get_modulesdir());
 +                    }
 +                    load_dir = reloc;
 +                }

…001-test_rand-use-the-better-chomp.patch …003-test_rand-use-the-better-chomp.patchmingw-w64-openssl/0001-test_rand-use-the-better-chomp.patch renamed to mingw-w64-openssl/003-test_rand-use-the-better-chomp.patch mingw-w64-openssl/0001-test_rand-use-the-better-chomp.patch renamed to mingw-w64-openssl/003-test_rand-use-the-better-chomp.patch

@@ -18,7 +18,7 @@ diff --git a/test/recipes/05-test_rand.t b/test/recipes/05-test_rand.t
 index aa012c1..f2c1374 100644
 --- a/test/recipes/05-test_rand.t
 +++ b/test/recipes/05-test_rand.t
-@@ -28,13 +28,13 @@ SKIP: {
+@@ -36,17 +36,17 @@ SKIP: {
 
      @randdata = run(app(['openssl', 'rand', '-engine', 'ossltest', '-hex', '16' ]),
                      capture => 1, statusvar => \$success);
@@ -27,6 +27,11 @@ index aa012c1..f2c1374 100644
      ok($success && $randdata[0] eq $expected,
         "rand with ossltest: Check rand output is as expected");
 
+     @randdata = run(app(['openssl', 'rand', '-hex', '2K' ]),
+                     capture => 1, statusvar => \$success);
+-    chomp(@randdata);
++    $_ =~ s|\R+$|| for @randdata;
+
      @randdata = run(app(['openssl', 'rand', '-engine', 'dasync', '-hex', '16' ]),
                      capture => 1, statusvar => \$success);
 -    chomp(@randdata);