diff --git a/.gitignore b/.gitignore index 897e50d..e6ae801 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/lib/win-amd64/libcrypto-1_1-x64.dll b/lib/win-amd64/libcrypto-1_1-x64.dll deleted file mode 100644 index f746f0e..0000000 Binary files a/lib/win-amd64/libcrypto-1_1-x64.dll and /dev/null differ diff --git a/lib/win-amd64/libcrypto-3-x64.dll b/lib/win-amd64/libcrypto-3-x64.dll new file mode 100644 index 0000000..bc3bdb7 Binary files /dev/null and b/lib/win-amd64/libcrypto-3-x64.dll differ diff --git a/lib/win-amd64/libcrypto.lib b/lib/win-amd64/libcrypto.lib index 0582301..0038a7c 100644 Binary files a/lib/win-amd64/libcrypto.lib and b/lib/win-amd64/libcrypto.lib differ diff --git a/lib/win-amd64/libssl-1_1-x64.dll b/lib/win-amd64/libssl-1_1-x64.dll deleted file mode 100644 index 6f63ea4..0000000 Binary files a/lib/win-amd64/libssl-1_1-x64.dll and /dev/null differ diff --git a/lib/win-amd64/libssl-3-x64.dll b/lib/win-amd64/libssl-3-x64.dll new file mode 100644 index 0000000..2344a55 Binary files /dev/null and b/lib/win-amd64/libssl-3-x64.dll differ diff --git a/lib/win-amd64/libssl.lib b/lib/win-amd64/libssl.lib index 8685664..cb28182 100644 Binary files a/lib/win-amd64/libssl.lib and b/lib/win-amd64/libssl.lib differ diff --git a/lib/win-i386-mscoff/libcrypto.lib b/lib/win-i386-mscoff/libcrypto.lib deleted file mode 100644 index 3890196..0000000 Binary files a/lib/win-i386-mscoff/libcrypto.lib and /dev/null differ diff --git a/lib/win-i386-mscoff/libssl.lib b/lib/win-i386-mscoff/libssl.lib deleted file mode 100644 index 178cff0..0000000 Binary files a/lib/win-i386-mscoff/libssl.lib and /dev/null differ diff --git a/lib/win-i386/libcrypto-1_1.dll b/lib/win-i386/libcrypto-1_1.dll deleted file mode 100644 index bccad62..0000000 Binary files a/lib/win-i386/libcrypto-1_1.dll and /dev/null differ diff --git a/lib/win-i386/libcrypto-3.dll b/lib/win-i386/libcrypto-3.dll new file mode 100644 index 0000000..94b71ac Binary files /dev/null and b/lib/win-i386/libcrypto-3.dll differ diff --git a/lib/win-i386/libcrypto.lib b/lib/win-i386/libcrypto.lib index 1202cc9..6de4fde 100644 Binary files a/lib/win-i386/libcrypto.lib and b/lib/win-i386/libcrypto.lib differ diff --git a/lib/win-i386/libssl-1_1.dll b/lib/win-i386/libssl-1_1.dll deleted file mode 100644 index 29d81bc..0000000 Binary files a/lib/win-i386/libssl-1_1.dll and /dev/null differ diff --git a/lib/win-i386/libssl-3.dll b/lib/win-i386/libssl-3.dll new file mode 100644 index 0000000..05103f0 Binary files /dev/null and b/lib/win-i386/libssl-3.dll differ diff --git a/lib/win-i386/libssl.lib b/lib/win-i386/libssl.lib index 0296c8b..8f54221 100644 Binary files a/lib/win-i386/libssl.lib and b/lib/win-i386/libssl.lib differ diff --git a/tests/tls.d b/tests/tls.d index f7ec824..bfce287 100644 --- a/tests/tls.d +++ b/tests/tls.d @@ -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); @@ -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); } diff --git a/tls/dub.sdl b/tls/dub.sdl index 738e9b6..aa0a9c3 100644 --- a/tls/dub.sdl +++ b/tls/dub.sdl @@ -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" {