fix preprocessor concatenation

Author: chouquette

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

@@ -0,0 +1,43 @@
+From 9c67ef92cb39f39a214f8c778de428235b9b4d54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo.beauzee@datadoghq.com>
+Date: Fri, 24 Jan 2025 17:05:19 +0100
+Subject: [PATCH] fix preprocessor concatenation
+
+---
+ crypto/defaults.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/defaults.c b/crypto/defaults.c
+index 908539cf31..0a40954c52 100644
+--- a/crypto/defaults.c
++++ b/crypto/defaults.c
+@@ -19,7 +19,7 @@
+ # define MAKESTR(x) TOSTR(x)
+ # define NOQUOTE(x) x
+ # if defined(OSSL_WINCTX)
+-# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" ##"-"## MAKESTR(OPENSSL_VERSION_MAJOR) ##"."## MAKESTR(OPENSSL_VERSION_MINOR) ##"-"## MAKESTR(OSSL_WINCTX)
++# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" "-" MAKESTR(OPENSSL_VERSION_MAJOR) "." MAKESTR(OPENSSL_VERSION_MINOR) "-" MAKESTR(OSSL_WINCTX)
+ # endif
+ 
+ /**
+@@ -70,7 +70,7 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
+     LSTATUS ret;
+     DWORD index = 0;
+     LPCTCH tempstr = NULL;
+-   
++
+     ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                        TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
+                        KEY_QUERY_VALUE, &hkey);
+@@ -97,7 +97,7 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
+         goto out;
+ 
+     if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,
+-                             NULL, NULL)) 
++                             NULL, NULL))
+         goto out;
+ 
+     retval = dst;
+-- 
+2.34.1
+

config/software/openssl3.rb

@@ -42,6 +42,7 @@
 relative_path "openssl-#{version}"
 
 build do
+  patch source: "0001-fix-preprocessor-concatenation.patch"
 
   env = with_standard_compiler_flags(with_embedded_path)
   if windows?