From 89cc524d173f3728d74ab3ac5a3b132e50c73079 Mon Sep 17 00:00:00 2001
From: fpinto <filipe.pinto@orange.com>
Date: Wed, 28 Dec 2022 22:42:27 +0100
Subject: [PATCH] Revert Use openssl3 for libcurl on windows

---
 .github/workflows/package.yml         | 12 ++++----
 .github/workflows/test.yml            | 12 ++++----
 Cargo.lock                            | 42 ---------------------------
 bin/install_prerequisites_windows.ps1 |  9 ++++--
 bin/release/release.ps1               |  2 +-
 bin/test/test_unit.ps1                |  2 +-
 bin/windows/hurl.nsi                  | 15 ----------
 contrib/windows/README.md             |  2 +-
 packages/hurl/Cargo.toml              |  1 -
 9 files changed, 21 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 86c7c6c0c..e91f780c1 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -313,12 +313,12 @@ jobs:
       uses: actions/checkout@v3
       with:
         ref: ${{ inputs.branch }}
-    - name: Cache
-      uses: actions/cache@v3
-      with:
-        path: C:\vcpkg\installed
-        key: ${{ runner.os }}-release-windows-x64-${{ github.sha }}
-        restore-keys: ${{ runner.os }}-release-windows-x64-
+#    - name: Cache
+#      uses: actions/cache@v3
+#      with:
+#        path: C:\vcpkg\installed
+#        key: ${{ runner.os }}-release-windows-x64-${{ github.sha }}
+#        restore-keys: ${{ runner.os }}-release-windows-x64-
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e7e1b00a4..2cd771e1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -283,12 +283,12 @@ jobs:
       uses: actions/checkout@v3
       with:
         ref: ${{ inputs.branch }}
-    - name: Cache
-      uses: actions/cache@v3
-      with:
-        path: C:\vcpkg\installed
-        key: ${{ runner.os }}-test-windows-x64-${{ github.sha }}
-        restore-keys: ${{ runner.os }}-test-windows-x64-
+#    - name: Cache
+#      uses: actions/cache@v3
+#      with:
+#        path: C:\vcpkg\installed
+#        key: ${{ runner.os }}-test-windows-x64-${{ github.sha }}
+#        restore-keys: ${{ runner.os }}-test-windows-x64-
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
diff --git a/Cargo.lock b/Cargo.lock
index 51c9f2037..447993179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -423,21 +423,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -533,7 +518,6 @@ dependencies = [
  "libflate",
  "libxml",
  "md5",
- "openssl",
  "percent-encoding",
  "regex",
  "serde",
@@ -779,32 +763,6 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
-[[package]]
-name = "openssl"
-version = "0.10.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
diff --git a/bin/install_prerequisites_windows.ps1 b/bin/install_prerequisites_windows.ps1
index 1f81b0c82..ef996658a 100644
--- a/bin/install_prerequisites_windows.ps1
+++ b/bin/install_prerequisites_windows.ps1
@@ -5,13 +5,15 @@ powershell write-host -foregroundcolor Cyan "----- install system prerequisites
 
 # install libxml and libcurl[openssl]
 $vcpkg_dir=(Get-command vcpkg).Source
-if (Test-Path $vcpkg_dir\installed\x64-windows\bin\libssl-3-x64.dll) {echo "curl[openssl] already installed"} else {vcpkg install --recurse curl[openssl]:x64-windows}
+
+if (Test-Path $vcpkg_dir\installed\x64-windows\lib\libcurl.lib) {echo "curl already installed"} else {vcpkg install curl:x64-windows}
 if ($LASTEXITCODE) { Throw }
-if (Test-Path $vcpkg_dir\installed\x64-windows\bin\libxml2.dll) {echo "libxml2 already installed"} else {vcpkg install --recurse libxml2:x64-windows}
+if (Test-Path $vcpkg_dir\installed\x64-windows\lib\libxml2.lib) {echo "libxml2 already installed"} else {vcpkg install libxml2:x64-windows}
 if ($LASTEXITCODE) { Throw }
+
 vcpkg update
 if ($LASTEXITCODE) { Throw }
-vcpkg upgrade --no-dry-run
+vcpkg upgrade
 if ($LASTEXITCODE) { Throw }
 vcpkg integrate install
 if ($LASTEXITCODE) { Throw }
@@ -19,3 +21,4 @@ if ($LASTEXITCODE) { Throw }
 # update pip
 python -m pip install --upgrade pip --quiet
 if ($LASTEXITCODE) { Throw }
+
diff --git a/bin/release/release.ps1 b/bin/release/release.ps1
index 8fa3830b6..4f967061c 100644
--- a/bin/release/release.ps1
+++ b/bin/release/release.ps1
@@ -14,7 +14,7 @@ if ($LASTEXITCODE) { Throw }
 $release_dir="$project_root_path\target\release"
 $package_dir="$project_root_path\target\win-package"
 New-Item -ItemType Directory -Force -Path $package_dir
-Get-ChildItem -Path $release_dir\build -Recurse -Include *.dll -File | Copy-Item -Destination "$package_dir"
+Get-ChildItem -Path $release_dir -Recurse -Include *.dll -File | Copy-Item -Destination "$package_dir"
 Get-ChildItem -Path $release_dir -Recurse -Include hurl*.exe -File | Copy-Item -Destination "$package_dir"
 ((& $package_dir\hurl --version) -Split " ")[1] > $package_dir\version.txt
 Get-Content $package_dir\version.txt
diff --git a/bin/test/test_unit.ps1 b/bin/test/test_unit.ps1
index 0330b4ef0..6c41b338b 100644
--- a/bin/test/test_unit.ps1
+++ b/bin/test/test_unit.ps1
@@ -12,7 +12,7 @@ $project_root_path=(Resolve-Path -LiteralPath $PSScriptRoot\..\..).path
 $release_dir="$project_root_path\target\release"
 $package_dir="$project_root_path\target\test-package"
 New-Item -ItemType Directory -Force -Path "$package_dir"
-Get-ChildItem -Path $release_dir\build -Recurse -Include *.dll -File | Copy-Item -Destination $package_dir
+Get-ChildItem -Path $release_dir -Recurse -Include *.dll -File | Copy-Item -Destination $package_dir
 Get-ChildItem -Path $release_dir -Recurse -Include hurl*.exe -File | Copy-Item -Destination $package_dir
 
 # add hurl to PATH
diff --git a/bin/windows/hurl.nsi b/bin/windows/hurl.nsi
index 1230793b7..008ac7e6c 100644
--- a/bin/windows/hurl.nsi
+++ b/bin/windows/hurl.nsi
@@ -119,21 +119,6 @@ SectionGroup "dlls"
     SetOutPath $INSTDIR
     File "libcurl.dll"
   SectionEnd
-  Section "libssl-3-x64.dll"
-    SectionIn RO
-    SetOutPath $INSTDIR
-    File "libssl-3-x64.dll"
-  SectionEnd
-  Section "libcrypto-3-x64.dll"
-    SectionIn RO
-    SetOutPath $INSTDIR
-    File "libcrypto-3-x64.dll"
-  SectionEnd
-  Section "legacy.dll"
-    SectionIn RO
-    SetOutPath $INSTDIR
-    File "legacy.dll"
-  SectionEnd
 SectionGroupEnd
 
 SectionGroup "txt"
diff --git a/contrib/windows/README.md b/contrib/windows/README.md
index fb9c46c15..d6f29769c 100644
--- a/contrib/windows/README.md
+++ b/contrib/windows/README.md
@@ -46,7 +46,7 @@ git.exe clone https://github.com/Orange-OpenSource/hurl
 cd c:\hurl
 cargo build --release --verbose
 New-Item -ItemType "Directory" -Path c:\hurl\target -Name "win-package"
-Get-ChildItem -Path c:\hurl\target\release\build -Recurse -Include *.dll -File | Copy-Item -Destination "c:\hurl\target\win-package"
+Get-ChildItem -Path c:\hurl\target\release -Recurse -Include *.dll -File | Copy-Item -Destination "c:\hurl\target\win-package"
 Get-ChildItem -Path c:\hurl\target\release -Recurse -Include hurl*.exe -File | Copy-Item -Destination "c:\hurl\target\win-package"
 ((c:\hurl\target\win-package\hurl.exe --version) -Split " ")[1] > c:\hurl\target\win-package\version.txt
 $oldpath = Get-ItemProperty -Path HKCU:\Environment -Name Path
diff --git a/packages/hurl/Cargo.toml b/packages/hurl/Cargo.toml
index eaae4e5c3..71ff7c117 100644
--- a/packages/hurl/Cargo.toml
+++ b/packages/hurl/Cargo.toml
@@ -48,7 +48,6 @@ termion = "2.0.1"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1.12"
-openssl = "0.10.45"
 
 [build-dependencies]
 cc = "1.0.78"