diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index 6ee994afbf..61a70efc38 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) Default diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index 532e506397..89eb279949 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) cd ..\..\..\Build\$(Configuration) @@ -114,7 +114,7 @@ copy /Y named-checkzone.ilk named-compilezone.ilk true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) Default diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in index df2ba60b03..141763e26e 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/confgen/win32/tsigkeygen.vcxproj.in b/bin/confgen/win32/tsigkeygen.vcxproj.in index c12dd1c0b0..1664c0b236 100644 --- a/bin/confgen/win32/tsigkeygen.vcxproj.in +++ b/bin/confgen/win32/tsigkeygen.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) cd ..\..\..\Build\$(Configuration) @@ -115,7 +115,7 @@ copy /Y tsig-keygen.ilk ddns-confgen.ilk ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) cd ..\..\..\Build\$(Configuration) diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index 0ae7565b76..135f51f80e 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 33632379e4..ca020168a6 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 1851fd3275..8b6d302e65 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index babc99883e..0ff4268001 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index 2c9ce759f3..8328a277f5 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index 16585e6348..be24c8d377 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @IF PYTHON @@ -122,7 +122,7 @@ set PYTHONPATH=. ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @IF PYTHON diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index 6be1ce1e76..ef137a173b 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index d4e0f85911..5b5a898d68 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index 58c1e408e1..ad93ba3796 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -76,7 +76,7 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index cf4174a4e6..03eb175507 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 22b45d93dd..505f299ad5 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -76,7 +76,7 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index f7b0f5c018..b53c10c15b 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index 748e48f110..9eab75887c 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -76,7 +76,7 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - @OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index cd3d934ead..73f091ea9c 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) cd .. @@ -114,7 +114,7 @@ perl -e "print \";\";" >> xsl.c ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) cd .. diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index 00a93794be..8bf3eb4453 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 842581dc31..fb2ff89761 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index 3655c87560..5c58ad1171 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index 7425207197..80d7a08726 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index eb3415472a..9b38ccee3c 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies) diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index df7c3a9144..1e8ca06776 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in index 61daea6799..f5b14e6ad2 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in index 4af9da949e..cff4647a45 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index 0f6883ca8f..656b3017d5 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index 59b805cf16..8a6943bc48 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/makejournal.vcxproj.in b/bin/tests/system/win32/makejournal.vcxproj.in index 13cb6d13f5..139dfc856f 100644 --- a/bin/tests/system/win32/makejournal.vcxproj.in +++ b/bin/tests/system/win32/makejournal.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index 752beff740..870811ba34 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index 179a699b7b..a601b50326 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index 8ccb70d9ed..08fbaa9dc4 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index d0d86c2da0..fdaaa82bfb 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index 17c014fb9e..33f648382e 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index e95fbe3dc9..14e4a6145c 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -77,7 +77,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) @@ -109,7 +109,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies) diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 001865cf08..a8be6ec126 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -79,7 +79,7 @@ Windows true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@nafxcwd.lib;version.lib;netapi32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@nafxcwd.lib;version.lib;netapi32.lib;%(AdditionalDependencies) false @@ -110,7 +110,7 @@ true true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@nafxcw.lib;version.lib;netapi32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@nafxcw.lib;version.lib;netapi32.lib;%(AdditionalDependencies) Default false diff --git a/configure.ac b/configure.ac index c43c51eee6..4e5332750e 100644 --- a/configure.ac +++ b/configure.ac @@ -607,7 +607,7 @@ CRYPTO=OpenSSL # # OpenSSL/LibreSSL is mandatory # -PKG_CHECK_MODULES([OPENSSL], [libcrypto], [], +PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto], [], [AX_CHECK_OPENSSL([:],[AC_MSG_FAILURE([OpenSSL/LibreSSL not found])])]) AX_SAVE_FLAGS([openssl]) @@ -698,6 +698,8 @@ AC_CHECK_FUNCS([EVP_aes_128_ecb EVP_aes_192_ecb EVP_aes_256_ecb], [:], # AC_CHECK_FUNCS([DH_get0_key ECDSA_SIG_get0 RSA_set0_key]) +AC_CHECK_FUNCS([TLS_server_method]) + # # Check whether FIPS mode is available and whether we should enable it # diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index d483e97006..fe9d00b9bd 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -74,7 +74,7 @@ Console true ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) .\libbind9.def .\$(Configuration)\$(ProjectName).lib ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) @@ -107,7 +107,7 @@ true true ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) .\libbind9.def .\$(Configuration)\$(ProjectName).lib Default diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index cc008979dd..e08156afee 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib Default diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index 1b39b3c73f..b5a96a0b11 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -74,7 +74,7 @@ Console true ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) .\libirs.def .\$(Configuration)\$(ProjectName).lib ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) @@ -107,7 +107,7 @@ true true ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) .\libirs.def .\$(Configuration)\$(ProjectName).lib Default diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 9da70435f0..e785ed73cf 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -80,7 +80,7 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib @@ -103,7 +103,8 @@ copy ..\COPYRIGHT ..\Build\Debug echo Copying the OpenSSL DLL and LICENSE. -copy @OPENSSL_DLL@ ..\Build\Debug\ +copy @OPENSSL_DLLCRYPTO@ ..\Build\Debug\ +copy @OPENSSL_DLLSSL@ ..\Build\Debug\ copy @OPENSSL_PATH@\LICENSE ..\Build\Debug\OpenSSL-LICENSE echo Copying libuv DLL. @@ -183,7 +184,7 @@ copy InstallFiles ..\Build\Debug\ true true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - @OPENSSL_LIB@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib Default @@ -203,7 +204,8 @@ copy ..\LICENSE ..\Build\Release echo Copying the OpenSSL DLL and LICENSE. -copy @OPENSSL_DLL@ ..\Build\Release\ +copy @OPENSSL_DLLCRYPTO@ ..\Build\Release\ +copy @OPENSSL_DLLSSL@ ..\Build\Release\ copy @OPENSSL_PATH@\LICENSE ..\Build\Release\OpenSSL-LICENSE echo Copying libuv DLL. diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index 0508dfd7b6..b4297cec17 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib @@ -108,7 +108,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib Default diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 27811bbba4..c828431b5f 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -74,7 +74,7 @@ Console true ..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies) ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib @@ -107,7 +107,7 @@ true true ..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies) Default ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(ProjectName).def diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index 41604ba171..02a97435fb 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -74,7 +74,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib @@ -107,7 +107,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBUV_LIB@@OPENSSL_LIB@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) + @LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def .\$(Configuration)\$(ProjectName).lib Default diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index 960e4fd4cb..37a071bdf3 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index 65b61e426c..4581683f27 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index 9ba7f32c95..40045e3781 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index 34941439aa..9923514663 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index 814e7f93c6..7e125d77a4 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 85d72b0e45..19d0c2d176 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -68,7 +68,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ AS_IF([test -f "$ssldir/include/openssl/ssl.h"], [ OPENSSL_CFLAGS="-I$ssldir/include" - OPENSSL_LIBS="-L$ssldir/lib -lcrypto" + OPENSSL_LIBS="-L$ssldir/lib -lcrypto -lssl" found=true AC_MSG_RESULT([yes]) break diff --git a/win32utils/Configure b/win32utils/Configure index 7f86b54cba..e8ec8a3684 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -248,7 +248,8 @@ my @substlib = ("GSSAPI_LIB", "KRB5_LIB", "LIBXML2_LIB", "LIBUV_LIB", - "OPENSSL_LIB", + "OPENSSL_LIBCRYPTO", + "OPENSSL_LIBSSL", "READLINE_LIB", "READLINE_LIBD", "ZLIB_LIB"); @@ -265,7 +266,8 @@ my @substdll = ("COMERR_DLL", "K5SPRT_DLL", "LIBXML2_DLL", "LIBUV_DLL", - "OPENSSL_DLL", + "OPENSSL_DLLCRYPTO", + "OPENSSL_DLLSSL", "WSHELP_DLL", "ZLIB_DLL"); @@ -1379,60 +1381,59 @@ if ($use_openssl eq "auto") { } # falls into (so no else) if ($use_openssl eq "yes") { + my @dirlist; $openssl_path = File::Spec->rel2abs($openssl_path); if ($verbose) { print "checking for OpenSSL built directory at \"$openssl_path\"\n"; } - my $openssl_new = 0; if (!-f File::Spec->catfile($openssl_path, - "inc32/openssl/opensslv.h")) { - $openssl_new = 1; - if (!-f File::Spec->catfile($openssl_path, "include/openssl/opensslv.h")) { - die "can't find OpenSSL opensslv.h include\n"; - } + die "can't find OpenSSL 1.1 opensslv.h include\n"; } - my $openssl_inc = File::Spec->catdir($openssl_path, "inc32"); - my $openssl_libdir = File::Spec->catdir($openssl_path, "out32dll"); - my $openssl_lib = File::Spec->catfile($openssl_libdir, "libeay32.lib"); - my $openssl_dll = File::Spec->catfile($openssl_libdir, "libeay32.dll"); - if (!$openssl_new) { - # Check libraries are where we expect - if (!-f $openssl_lib) { - die "can't find OpenSSL libeay32.lib library\n"; - } - if (!-f $openssl_dll) { - die "can't find OpenSSL libeay32.dll DLL\n"; - } - } else { - # OpenSSL >= 1.1 is easier at the exception of the DLL - if ($verbose) { - print "new (>= 1.1) OpenSSL version\n"; - } - $openssl_inc = File::Spec->catdir($openssl_path, "include"); - $openssl_libdir = $openssl_path; - $openssl_lib = File::Spec->catfile($openssl_path, "libcrypto.lib"); - if (!-f $openssl_lib) { - die "can't find OpenSSL libcrypto.lib library\n"; - } - opendir DIR, $openssl_path || die "No Directory: $!\n"; - my @dirlist = grep (/^libcrypto-[^.]+\.dll$/i, readdir(DIR)); - closedir(DIR); - # We must get one file only - if (scalar(@dirlist) == 0) { - die "can't find OpenSSL libcrypto-*.dll DLL\n"; - } - if (scalar(@dirlist) != 1) { - die "find more than one OpenSSL libcrypto-*.dll DLL candidate\n"; - } - $openssl_dll = File::Spec->catdir($openssl_path, "$dirlist[0]"); + my $openssl_inc = File::Spec->catdir($openssl_path, "include"); + my $openssl_libdir = $openssl_path; + my $openssl_libcrypto = File::Spec->catfile($openssl_path, "libcrypto.lib"); + my $openssl_libssl = File::Spec->catfile($openssl_libdir, "libssl.lib"); + my $openssl_dllcrypto = File::Spec->catfile($openssl_libdir, "libcrypto.dll"); + my $openssl_dllssl = File::Spec->catfile($openssl_libdir, "libssl.dll"); + + if (!-f $openssl_libcrypto) { + die "can't find OpenSSL libcrypto.lib library\n"; } + opendir DIR, $openssl_path || die "No Directory: $!\n"; + @dirlist = grep (/^libcrypto-[^.]+\.dll$/i, readdir(DIR)); + closedir(DIR); + # We must get one file only + if (scalar(@dirlist) == 0) { + die "can't find OpenSSL libcrypto-*.dll DLL\n"; + } + if (scalar(@dirlist) != 1) { + die "found more than one OpenSSL libcrypto-*.dll DLL candidate\n"; + } + $openssl_dllcrypto = File::Spec->catdir($openssl_path, "$dirlist[0]"); + + if (!-f $openssl_libssl) { + die "can't find OpenSSL libssl.lib library\n"; + } + opendir DIR, $openssl_path || die "No Directory: $!\n"; + @dirlist = grep (/^libssl-[^.]+\.dll$/i, readdir(DIR)); + closedir(DIR); + # We must get one file only + if (scalar(@dirlist) == 0) { + die "can't find OpenSSL libssl-*.dll DLL\n"; + } + if (scalar(@dirlist) != 1) { + die "found more than one OpenSSL libssl-*.dll DLL candidate\n"; + } + $openssl_dllssl = File::Spec->catdir($openssl_path, "$dirlist[0]"); $cryptolib = "openssl"; $configvar{"OPENSSL_PATH"} = "$openssl_path"; $configinc{"OPENSSL_INC"} = "$openssl_inc"; - $configlib{"OPENSSL_LIB"} = "$openssl_lib"; - $configdll{"OPENSSL_DLL"} = "$openssl_dll"; + $configlib{"OPENSSL_LIBCRYPTO"} = "$openssl_libcrypto"; + $configdll{"OPENSSL_DLLCRYPTO"} = "$openssl_dllcrypto"; + $configlib{"OPENSSL_LIBSSL"} = "$openssl_libssl"; + $configdll{"OPENSSL_DLLSSL"} = "$openssl_dllssl"; } if ($cryptolib eq "openssl") { @@ -1445,14 +1446,28 @@ if ($cryptolib eq "openssl") { # check OpenSSL if ($use_openssl eq "yes") { - if ($verbose) { - print "checking whether linking with OpenSSL works\n"; - } - my $dll = $configdll{"OPENSSL_DLL"}; +#prepare the environment + my $dll = $configdll{"OPENSSL_DLLCRYPTO"}; my $ret = `copy "$dll" .`; if ($? != 0) { die "Can't copy OpenSSL DLL to working directory: $ret\n"; } + + $dll = $configdll{"OPENSSL_DLLSSL"}; + $ret = `copy "$dll" .`; + if ($? != 0) { + die "Can't copy OpenSSL DLL to working directory: $ret\n"; + } + + my $include = $configinc{"OPENSSL_INC"}; + my $libcrypto = $configlib{"OPENSSL_LIBCRYPTO"}; + my $libssl = $configlib{"OPENSSL_LIBSSL"}; + +# check libcrypto + if ($verbose) { + print "checking whether linking with OpenSSL libcrypto works\n"; + } + open F, ">testossl.c" || die $!; print F << 'EOF'; #include @@ -1465,21 +1480,45 @@ main(void) } EOF close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" testossl.c "$library"`; + + $compret = `cl /nologo /MD /I "$include" testossl.c "$libcrypto"`; if (grep { -f and -x } "./testossl.exe") { `./testossl.exe`; if ($? != 0) { - die "OpenSSL test failed\n"; + die "OpenSSL libcrypto test failed\n"; } } else { - die "can't compile OpenSSL test: $compret\n"; + die "can't compile OpenSSL libcrypto test: $compret\n"; } + + if ($verbose) { + print "checking whether linking with OpenSSL libssl works\n"; + } + + open F, ">testossl.c" || die $!; + print F << 'EOF'; +#include + +int +main(void) +{ + SSL_CTX *ctx = SSL_CTX_new(SSLv23_method()); + SSL_CTX_free(ctx); + return(0); } +EOF + close F; + $compret = `cl /nologo /MD /I "$include" testossl.c "$libcrypto" "$libssl"`; + if (grep { -f and -x } "./testossl.exe") { + `./testossl.exe`; + if ($? != 0) { + die "OpenSSL libssl test failed\n"; + } + } else { + die "can't compile OpenSSL libssl test: $compret\n"; + } # check OpenSSL version -if ($use_openssl eq "yes") { if ($verbose) { printf "checking OpenSSL library version\n"; } @@ -1499,9 +1538,8 @@ int main() { } EOF close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" testosslv.c "$library"`; + + $compret = `cl /nologo /MD /I "$include" testosslv.c "$libcrypto"`; if (grep { -f and -x } "./testosslv.exe") { `./testosslv.exe`; if ($? != 0) { @@ -1510,10 +1548,8 @@ EOF } else { die "can't compile OpenSSL version test: $compret\n"; } -} # check OpenSSL built-in support for DH/ECDSA/RSA/CRYPTO_ZALLOC/EVP_CIPHER_CTX/EVP_MD_CTX/HMAC_CTX functions -if ($use_openssl eq "yes") { if ($verbose) { printf "checking OpenSSL built-in support for DH/ECDSA/RSA/CRYPTO_ZALLOC/EVP_CIPHER_CTX/EVP_MD_CTX/HMAC_CTX functions\n"; } @@ -1533,9 +1569,8 @@ int main() { } EOF close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" testosslfunc.c "$library"`; + + $compret = `cl /nologo /MD /I "$include" testosslfunc.c "$libcrypto"`; if (grep { -f and -x } "./testosslfunc.exe") { `./testosslfunc.exe`; if ($? == 0) { @@ -1554,9 +1589,7 @@ EOF $configdefh{"HAVE_HMAC_CTX_RESET"} = 1; } } -} -if ($use_openssl eq "yes") { if ($verbose) { print "checking for OpenSSL Ed25519 support\n"; } @@ -1577,9 +1610,8 @@ main(void) } EOF close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" tested25519.c "$library"`; + + $compret = `cl /nologo /MD /I "$include" tested25519.c "$libcrypto"`; if (grep { -f and -x } "./tested25519.exe") { `./tested25519.exe`; if ($? == 0) { @@ -1595,9 +1627,7 @@ EOF print "disabling Ed25519\n"; } } -} -if ($use_openssl eq "yes") { if ($verbose) { print "checking for OpenSSL Ed448 support\n"; } @@ -1618,9 +1648,8 @@ main(void) } EOF close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" tested448.c "$library"`; + + $compret = `cl /nologo /MD /I "$include" tested448.c "$libcrypto"`; if (grep { -f and -x } "./tested448.exe") { `./tested448.exe`; if ($? == 0) { @@ -2463,7 +2492,9 @@ sub makeinstallfile { my $v; my $d; my $name; - ($v, $d, $name) =File::Spec->splitpath($configdll{"OPENSSL_DLL"}); + ($v, $d, $name) =File::Spec->splitpath($configdll{"OPENSSL_DLLCRYPTO"}); + print LOUT "${name}-BCFT\n"; + ($v, $d, $name) =File::Spec->splitpath($configdll{"OPENSSL_DLLSSL"}); print LOUT "${name}-BCFT\n"; } if ($use_libxml2 eq "yes") {