saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Upgrade OpenSSL dlls to 1.1.1j

Browse source
This commit is contained in:
twangboy 2021-03-22 17:25:17 -06:00 • committed by Gareth J. Greenaway
parent 647c1e90d3
commit a483b87297
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog/59865.fixed Normal file
View file

@ -0,0 +1,3 @@
Update the Salt installer to use Python 3.8 for its python environment
Update libsodium.dll to 1.0.18
Update OpenSSL dlls to 1.1.1j

12
pkg/windows/modules/get-settings.psm1
View file

@ -83,18 +83,18 @@ Function Get-Settings {
# DLL's for 64 bit Windows
$64bitDLLs = @{
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"Libeay" = "openssl/1.1.1j/libeay32.dll"
"SSLeay" = "openssl/1.1.1j/ssleay32.dll"
"OpenSSLLic" = "openssl/1.1.1j/OpenSSL_License.txt"
"Libsodium" = "libsodium/1.0.18/libsodium.dll"
}
$ini.Add("64bitDLLs", $64bitDLLs)
# DLL's for 32 bit Windows
$32bitDLLs = @{
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"Libeay" = "openssl/1.1.1j/libeay32.dll"
"SSLeay" = "openssl/1.1.1j/ssleay32.dll"
"OpenSSLLic" = "openssl/1.1.1j/OpenSSL_License.txt"
"Libsodium" = "libsodium/1.0.18/libsodium.dll"
}
$ini.Add("32bitDLLs", $32bitDLLs)

4
setup.py
View file

@ -505,8 +505,8 @@ class DownloadWindowsDlls(Command):
dest = os.path.join(os.path.dirname(sys.executable), "{fname}")
with indent_log():
for fname in (
"ssleay32.dll",
"libeay32.dll",
"openssl/1.1.1j/ssleay32.dll",
"openssl/1.1.1j/libeay32.dll",
"libsodium/1.0.18/libsodium.dll",
):
# See if the library is already on the system