#4146 use the new location for openssl.cnf

Xpra-org · Jul 6, 2024 · d23f941 · d23f941
1 parent b5a3c97
commit d23f941
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packaging/MSWindows/BUILD.sh b/packaging/MSWindows/BUILD.sh
@@ -600,8 +600,8 @@ fi
 
 if [ "${BUNDLE_OPENSSL}" == "1" ]; then
 	cp -fn "${MINGW_PREFIX}/bin/openssl.exe" "${DIST}/"
-	#use the old filename so we don't have to change the xpra.iss and the setup.py build system:
-	cp -fn "${MINGW_PREFIX}/ssl/openssl.cnf" "${DIST}/openssl.cfg"
+	mkdir -p "${DIST}/etc/ssl"
+	cp -fn "${MINGW_PREFIX}/etc/ssl/openssl.cnf" "${DIST}/etc/ssl/openssl.cnf"
 	#we need those libraries at the top level:
 	mv "${DIST}"/lib/libssl-*dll "${DIST}/"
 	mv "${DIST}"/lib/libcrypto-*dll "${DIST}/"

diff --git a/packaging/MSWindows/xpra.iss b/packaging/MSWindows/xpra.iss
@@ -185,7 +185,7 @@ begin
   cert := ExpandConstant('{commonappdata}\Xpra\ssl-cert.pem');
   if (NOT FileExists(cert)) then
   begin
-    config := ExpandConstant('{app}\openssl.cfg');
+    config := ExpandConstant('{app}\etc\ssl\openssl.cnf');
     args := 'req -new -newkey rsa:4096 -days 365 -nodes -x509 -config "'+config+'" -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -out "'+cert+'" -keyout "'+cert+'"';
     openssl := ExpandConstant('{app}\OpenSSL.exe');
     if (FileExists(openssl)) then