Skip to content

Commit

Permalink
Merge pull request #5 from vibe-d/upgrade_windows_dlls
Browse files Browse the repository at this point in the history
Upgrade windows OpenSSL DLLs to 3.2.1
  • Loading branch information
l-kramer authored Feb 20, 2024
2 parents 6c308e1 + 56c6ea8 commit 6b5c70b
Show file tree
Hide file tree
Showing 17 changed files with 15 additions and 29 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ vibe-core-test-*
*.lst
*.obj
*.sln
*.exp
*.def
*.pdb
dub.selections.json
vibe_core.lib
tests/tests

/*.dll
/*.lib
/tls/*.dll
/tls/*.lib
Binary file removed lib/win-amd64/libcrypto-1_1-x64.dll
Binary file not shown.
Binary file added lib/win-amd64/libcrypto-3-x64.dll
Binary file not shown.
Binary file modified lib/win-amd64/libcrypto.lib
Binary file not shown.
Binary file removed lib/win-amd64/libssl-1_1-x64.dll
Binary file not shown.
Binary file added lib/win-amd64/libssl-3-x64.dll
Binary file not shown.
Binary file modified lib/win-amd64/libssl.lib
Binary file not shown.
Binary file removed lib/win-i386-mscoff/libcrypto.lib
Binary file not shown.
Binary file removed lib/win-i386-mscoff/libssl.lib
Binary file not shown.
Binary file removed lib/win-i386/libcrypto-1_1.dll
Binary file not shown.
Binary file added lib/win-i386/libcrypto-3.dll
Binary file not shown.
Binary file modified lib/win-i386/libcrypto.lib
Binary file not shown.
Binary file removed lib/win-i386/libssl-1_1.dll
Binary file not shown.
Binary file added lib/win-i386/libssl-3.dll
Binary file not shown.
Binary file modified lib/win-i386/libssl.lib
Binary file not shown.
11 changes: 0 additions & 11 deletions tests/tls.d
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,18 @@ void testConn(TLSVersion cli_version, TLSVersion srv_version, bool expect_succes

void testVersion()
{
// NOTE: SSLv3 is not supported anymore by current OpenSSL versions
// NOTE: Ubuntu 20.04 has removed support for TLSv1/TLSv1.1 from OpenSSL
version (linux) enum support_old_tls = false;
else enum support_old_tls = true;

testConn(TLSVersion.ssl3, TLSVersion.any, false);
testConn(TLSVersion.ssl3, TLSVersion.ssl3, false);
testConn(TLSVersion.ssl3, TLSVersion.tls1, false);
testConn(TLSVersion.ssl3, TLSVersion.tls1_1, false);
testConn(TLSVersion.ssl3, TLSVersion.tls1_2, false);

if (support_old_tls) testConn(TLSVersion.tls1, TLSVersion.any, true);
testConn(TLSVersion.tls1, TLSVersion.ssl3, false);
if (support_old_tls) testConn(TLSVersion.tls1, TLSVersion.tls1, true);
testConn(TLSVersion.tls1, TLSVersion.tls1_1, false);
testConn(TLSVersion.tls1, TLSVersion.tls1_2, false);

if (support_old_tls) testConn(TLSVersion.tls1_1, TLSVersion.any, true);
testConn(TLSVersion.tls1_1, TLSVersion.ssl3, false);
testConn(TLSVersion.tls1_1, TLSVersion.tls1, false);
if (support_old_tls) testConn(TLSVersion.tls1_1, TLSVersion.tls1_1, true);
testConn(TLSVersion.tls1_1, TLSVersion.tls1_2, false);

testConn(TLSVersion.tls1_2, TLSVersion.any, true);
Expand All @@ -286,8 +277,6 @@ void testVersion()

testConn(TLSVersion.any, TLSVersion.any, true);
testConn(TLSVersion.any, TLSVersion.ssl3, false);
if (support_old_tls) testConn(TLSVersion.any, TLSVersion.tls1, true);
if (support_old_tls) testConn(TLSVersion.any, TLSVersion.tls1_1, true);
testConn(TLSVersion.any, TLSVersion.tls1_2, true);
}

Expand Down
25 changes: 7 additions & 18 deletions tls/dub.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,26 @@ targetType "library"
sourcePaths "."
importPaths "."

configuration "openssl-mscoff" {
platforms "windows-x86_mscoff" "windows-x86-ldc"
subConfiguration "openssl" "library-manual-version"
subConfiguration "openssl-static" "none"
versions "DeimosOpenSSL_1_1_0"
sourceFiles "../lib/win-i386-mscoff/libssl.lib" "../lib/win-i386-mscoff/libcrypto.lib" platform="windows-x86"
copyFiles "../lib/win-i386/libssl-1_1.dll" "../lib/win-i386/libcrypto-1_1.dll" platform="windows-x86"
}

configuration "openssl" {
platforms "posix"
}

configuration "openssl-1.1" {
configuration "openssl-3.0" {
platforms "posix" "windows"
subConfiguration "openssl" "library-manual-version"
subConfiguration "openssl-static" "none"
versions "DeimosOpenSSL_1_1_0"
sourceFiles "../lib/win-i386-mscoff/libssl.lib" "../lib/win-i386-mscoff/libcrypto.lib" platform="windows-x86"
versions "DeimosOpenSSL_3_0"
sourceFiles "../lib/win-i386/libssl.lib" "../lib/win-i386/libcrypto.lib" platform="windows-x86"
sourceFiles "../lib/win-amd64/libssl.lib" "../lib/win-amd64/libcrypto.lib" platform="windows-x86_64"
copyFiles "../lib/win-i386/libssl-1_1.dll" "../lib/win-i386/libcrypto-1_1.dll" platform="windows-x86"
copyFiles "../lib/win-amd64/libssl-1_1-x64.dll" "../lib/win-amd64/libcrypto-1_1-x64.dll" platform="windows-x86_64"
copyFiles "../lib/win-i386/libssl-3.dll" "../lib/win-i386/libcrypto-3.dll" platform="windows-x86"
copyFiles "../lib/win-amd64/libssl-3-x64.dll" "../lib/win-amd64/libcrypto-3-x64.dll" platform="windows-x86_64"
}

configuration "openssl-1.1-optlink" {
platforms "windows-x86-dmd"
configuration "openssl-1.1" {
platforms "posix"
subConfiguration "openssl" "library-manual-version"
subConfiguration "openssl-static" "none"
versions "DeimosOpenSSL_1_1_0"
sourceFiles "../lib/win-i386/libssl.lib" "../lib/win-i386/libcrypto.lib" platform="windows-x86-dmd"
copyFiles "../lib/win-i386/libssl-1_1.dll" "../lib/win-i386/libcrypto-1_1.dll" platform="windows-x86"
}

configuration "openssl-1.0" {
Expand Down

0 comments on commit 6b5c70b

Please sign in to comment.