Merge pull request #9 from disig/wip-2.5.0

Update to SoftHSM 2.5.0
disig · Nov 6, 2018 · 7c80b1f · 7c80b1f
2 parents e9e8e15 + e15d811
commit 7c80b1f
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 93 deletions.
diff --git a/BUILDING.md b/BUILDING.md
diff --git a/OpenSSL/openssl-1.1.0h.tar.gz b/OpenSSL/openssl-1.1.0h.tar.gz
diff --git a/OpenSSL/openssl-1.1.0h.tar.gz.asc b/OpenSSL/openssl-1.1.0h.tar.gz.asc
diff --git a/OpenSSL/openssl-1.1.1.tar.gz b/OpenSSL/openssl-1.1.1.tar.gz
diff --git a/OpenSSL/openssl-1.1.1.tar.gz.asc b/OpenSSL/openssl-1.1.1.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAluXuZ8ACgkQ2cTSbQ5g
+RJE8LQgAiaOFIraF4VQu/mWxUKiO0IkoH//tgorru7XBnhG1F4RgCGNtoiACUgDz
+uWZDiFusutYQtZ6ANekBkqDwN1FhUhjg929jDuYhQEKGgncxkjHK8mWrObSY73TC
+16AOV21GH0rCrwBotdGO2eLgae2Qgrrek/3a7O0iRWKugwZoKB4D9a/JJc2LGkQJ
+UwIO7jx5RHEVoSPr1mQcquF0qGKDXtN575AGk1Kl1W5M3s0Zaemtl1gxCqDYYF0U
+dPlP6beEM6r9LuNJtO/rjXz+ZJD9CzF3+O/fgCdxvkmjRklBaOf8qMJdlrkpsURQ
+S0ulq/7KguoluU1IJxnF5XsK+yQKWw==
+=wvEX
+-----END PGP SIGNATURE-----
diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@ This project provides binary builds and MSI installers of [SoftHSM2](https://git
 
 These packages include both 32-bit and 64-bit versions of PKCS#11 library:
 
-[SoftHSM 2.4.0 "portable" ZIP archive](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.4.0/SoftHSM2-2.4.0-portable.zip)  
+[SoftHSM 2.5.0 "portable" ZIP archive](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.5.0/SoftHSM2-2.5.0-portable.zip)  
 Requires user to set/modify `SOFTHSM2_CONF` and `PATH` environment variables manually.
 
-[SoftHSM 2.4.0 MSI installer](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.4.0/SoftHSM2-2.4.0.msi)  
+[SoftHSM 2.5.0 MSI installer](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.5.0/SoftHSM2-2.5.0.msi)  
 Does everything automatically.
 
 ## Building the source

diff --git a/SoftHSM/misc/README.txt b/SoftHSM/misc/README.txt
@@ -8,8 +8,8 @@ project:
 
   https://www.opendnssec.org/softhsm/
 
-This package includes both 32-bit and 64-bit build of SoftHSM 2.3.0 statically 
-linked to OpenSSL 1.1.0h. Latest version of SoftHSM2 for Windows can be 
+This package includes both 32-bit and 64-bit build of SoftHSM 2.5.0 statically 
+linked to OpenSSL 1.1.1. Latest version of SoftHSM2 for Windows can be 
 downloaded from:
 
   https://github.com/disig/SoftHSM2-for-Windows

diff --git a/SoftHSM/softhsm-2.4.0.tar.gz b/SoftHSM/softhsm-2.4.0.tar.gz
diff --git a/SoftHSM/softhsm-2.4.0.tar.gz.sig b/SoftHSM/softhsm-2.4.0.tar.gz.sig
diff --git a/SoftHSM/softhsm-2.5.0.tar.gz b/SoftHSM/softhsm-2.5.0.tar.gz
diff --git a/SoftHSM/softhsm-2.5.0.tar.gz.sig b/SoftHSM/softhsm-2.5.0.tar.gz.sig
diff --git a/WiX/SoftHSM2/Product.wxs b/WiX/SoftHSM2/Product.wxs
@@ -30,7 +30,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <!-- Install with: msiexec /i SoftHSM2.msi /l* SoftHSM2-install.log -->
   <!-- Uninstall with: msiexec /x SoftHSM2.msi /l* SoftHSM2-uninstall.log -->
   <!-- Reinstall over broken installaton with: msiexec /fv SoftHSM2.msi /l* SoftHSM2-repair.log -->
-  <Product Id="C8303202-E347-4921-9070-447CDDCD0FFE" Name="SoftHSM2 for Windows" Language="1033" Version="2.4.0" Manufacturer="OpenDNSSEC Project" UpgradeCode="86E18DAC-C32B-4D32-8494-233AAFA4F303">
+  <Product Id="D05788D6-F5A5-429D-B443-BD4A09BCDDF8" Name="SoftHSM2 for Windows" Language="1033" Version="2.5.0" Manufacturer="OpenDNSSEC Project" UpgradeCode="86E18DAC-C32B-4D32-8494-233AAFA4F303">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="SoftHSM2.cab" EmbedCab="yes" CompressionLevel="high" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />