update the patch, again again

Author: chouquette

config/patches/openssl3/0001-fix-preprocessor-concatenation.patch

@@ -1,4 +1,4 @@
-From f39c0ccf0b8af918d16b8072cde116a4b33d32bb Mon Sep 17 00:00:00 2001
+From c7fc33d0f7541706048424b28292996690f5f1c1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
 Date: Mon, 27 Jan 2025 08:36:07 +0100
 Subject: [PATCH] crypto: fix preprocessor concatenation
@@ -8,8 +8,8 @@ failures:
 crypto/defaults.c:kepi:23: error: pasting ""SOFTWARE\\WOW6432Node\\OpenSSL"" and ""-"" does not give a valid preprocessing token
 ---
  crypto/cversion.c |  2 +-
- crypto/defaults.c | 10 +++++-----
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ crypto/defaults.c | 39 +++++++++++++++++++++------------------
+ 2 files changed, 22 insertions(+), 19 deletions(-)
 
 diff --git a/crypto/cversion.c b/crypto/cversion.c
 index 87154645b0..ae439c668b 100644
@@ -25,7 +25,7 @@ index 87154645b0..ae439c668b 100644
  #endif
 
 diff --git a/crypto/defaults.c b/crypto/defaults.c
-index 908539cf31..09ac5a8799 100644
+index 908539cf31..b649e90258 100644
 --- a/crypto/defaults.c
 +++ b/crypto/defaults.c
 @@ -19,7 +19,7 @@
@@ -37,31 +37,81 @@ index 908539cf31..09ac5a8799 100644
  # endif
 
  /**
-@@ -69,8 +69,8 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
+@@ -60,44 +60,47 @@ static char *modulesdirptr = NULL;
+  *
+  * @return A pointer to a char array containing the registry directories.
+  */
+-static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
++static char *get_windows_regdirs(char *dst, DWORD dstsizebytes, LPCWSTR valuename)
+ {
+     char *retval = NULL;
+ # ifdef REGISTRY_KEY
+-    DWORD keysize;
++    DWORD keysizebytes;
+     DWORD ktype;
      HKEY hkey;
      LSTATUS ret;
      DWORD index = 0;
 -    LPCTCH tempstr = NULL;
 -   
-+    LPCTSTR tempstr = NULL;
++    LPCWSTR tempstr = NULL;
 +
      ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                         TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
                         KEY_QUERY_VALUE, &hkey);
-@@ -93,11 +93,11 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
+     if (ret != ERROR_SUCCESS)
          goto out;
 
-     if (RegQueryValueEx(hkey, valuename,
+-    ret = RegQueryValueEx(hkey, valuename, NULL, &ktype, NULL,
+-                          &keysize);
++    // Always use wide call so we can avoid extra encoding conversions on the output
++    ret = RegQueryValueExW(hkey, valuename, NULL, &ktype, NULL,
++                          &keysizebytes);
+     if (ret != ERROR_SUCCESS)
+         goto out;
+-    if (ktype != REG_EXPAND_SZ)
++    if (ktype != REG_EXPAND_SZ && ktype != REG_SZ)
+         goto out;
+-    if (keysize > MAX_PATH)
++    if (keysizebytes > MAX_PATH*sizeof(WCHAR))
+         goto out;
+ 
+-    keysize++;
+-    tempstr = OPENSSL_zalloc(keysize * sizeof(TCHAR));
++    // RegQueryValueExW does not guarantee the buffer is null terminated,
++    // so we make space for one
++    keysizebytes += sizeof(WCHAR);
++    tempstr = OPENSSL_zalloc(keysizebytes);
+ 
+     if (tempstr == NULL)
+         goto out;
+ 
+-    if (RegQueryValueEx(hkey, valuename,
 -                        NULL, &ktype, tempstr, &keysize) != ERROR_SUCCESS)
-+                        NULL, &ktype, (LPBYTE)tempstr, &keysize) != ERROR_SUCCESS)
++    if (RegQueryValueExW(hkey, valuename,
++                        NULL, &ktype, (LPBYTE)tempstr, &keysizebytes) != ERROR_SUCCESS)
          goto out;
 
-     if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,
+-    if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,
 -                             NULL, NULL)) 
++    if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, dstsizebytes,
 +                             NULL, NULL))
          goto out;
 
      retval = dst;
+@@ -117,9 +120,9 @@ static CRYPTO_ONCE defaults_setup_init = CRYPTO_ONCE_STATIC_INIT;
+  */
+ DEFINE_RUN_ONCE_STATIC(do_defaults_setup)
+ {
+-    get_windows_regdirs(openssldir, TEXT("OPENSSLDIR"));
+-    get_windows_regdirs(enginesdir, TEXT("ENGINESDIR"));
+-    get_windows_regdirs(modulesdir, TEXT("MODULESDIR"));
++    get_windows_regdirs(openssldir, sizeof(openssldir), L"OPENSSLDIR");
++    get_windows_regdirs(enginesdir, sizeof(enginesdir), L"ENGINESDIR");
++    get_windows_regdirs(modulesdir, sizeof(modulesdir), L"MODULESDIR");
+ 
+     /*
+      * Set our pointers only if the directories are fetched properly
 -- 
 2.34.1