From ba7fd5837ea149b2e319cc577fad27ce1162a064 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 17 Feb 2025 22:30:31 -0500
Subject: Support non-SNI SSL certificates in Http extension

Implements https://github.com/wixtoolset/issues/issues/7622
---
 .../TestData/SniSsl/Package.en-us.wxl                   |  9 ---------
 .../WixToolsetTest.Http/TestData/SniSsl/Package.wxs     | 15 ---------------
 .../TestData/SniSsl/PackageComponents.wxs               | 12 ------------
 .../WixToolsetTest.Http/TestData/SniSsl/example.txt     |  1 -
 .../WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl  |  9 +++++++++
 .../test/WixToolsetTest.Http/TestData/Ssl/Package.wxs   | 15 +++++++++++++++
 .../TestData/Ssl/PackageComponents.wxs                  | 17 +++++++++++++++++
 .../test/WixToolsetTest.Http/TestData/Ssl/example.txt   |  1 +
 8 files changed, 42 insertions(+), 37 deletions(-)
 delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl
 delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs
 delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs
 delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt
 create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl
 create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs
 create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs
 create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt

(limited to 'src/ext/Http/test/WixToolsetTest.Http/TestData')

diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl
deleted file mode 100644
index f1df1234..00000000
--- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-  <String Id="FeatureTitle" Value="MsiPackage" />
-
-</WixLocalization>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs
deleted file mode 100644
index c85e9bba..00000000
--- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs
deleted file mode 100644
index f0aae485..00000000
--- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:http="http://wixtoolset.org/schemas/v4/wxs/http">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-        <Component>
-            <File Source="example.txt" />
-            <http:SniSslCertificate Host="example.com" Port="8080" Thumbprint="[SOME_THUMBPRINT]" HandleExisting="fail" />
-        </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl
new file mode 100644
index 00000000..f1df1234
--- /dev/null
+++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl
@@ -0,0 +1,9 @@
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
+  <String Id="FeatureTitle" Value="MsiPackage" />
+
+</WixLocalization>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs
new file mode 100644
index 00000000..69bdbccb
--- /dev/null
+++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MediaTemplate EmbedCab="yes" />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs
new file mode 100644
index 00000000..126d2944
--- /dev/null
+++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:http="http://wixtoolset.org/schemas/v4/wxs/http">
+    <Fragment>
+        <Property Id="PORTMANTEAU" Value="8088" />
+        <Property Id="SOME_THUMBPRINT" Value="8E64C2AB0A9F730C7D06C58441362A6376BD72FB" />
+        <Property Id="SOME_OTHER_THUMBPRINT" Value="14C1B207A930E29AE34778F3CE0680A1811E1AE1" />
+
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+            <Component>
+                <File Source="example.txt" />
+                <http:SniSslCertificate Host="example.com" Port="8080" Thumbprint="[SOME_THUMBPRINT]" HandleExisting="fail" />
+                <http:SslCertificate Port="[PORTMANTEAU]" Thumbprint="[SOME_OTHER_THUMBPRINT]" HandleExisting="replace" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt
new file mode 100644
index 00000000..1b4ffe8a
--- /dev/null
+++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt
@@ -0,0 +1 @@
+This is example.txt.
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb