Add libssl libraries to Windows build

author Ondřej Surý <ondrej@isc.org>

Sat, 10 Oct 2020 05:26:18 +0000 (07:26 +0200)

committer Ondřej Surý <ondrej@isc.org>

Mon, 9 Nov 2020 15:00:28 +0000 (16:00 +0100)
author Ondřej Surý <ondrej@isc.org>
Sat, 10 Oct 2020 05:26:18 +0000 (07:26 +0200)
committer Ondřej Surý <ondrej@isc.org>
Mon, 9 Nov 2020 15:00:28 +0000 (16:00 +0100)
diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in

index 6ee994afbfcaff44d9fa640d2beb9d221059ec44..61a70efc38b75af15e9e0d570cf7738eecea39a4 100644 (file)
--- a/bin/check/win32/checkconf.vcxproj.in
+++ b/bin/check/win32/checkconf.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
      </Link>
    </ItemDefinitionGroup>
diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in

index 532e506397fd5a4aa08aba6951ad05bbe8941ff5..89eb279949b52a3c3806851ce975f8658562e00d 100644 (file)
--- a/bin/check/win32/checkzone.vcxproj.in
+++ b/bin/check/win32/checkzone.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>cd ..\..\..\Build\$(Configuration)
@@ -114,7 +114,7 @@ copy /Y named-checkzone.ilk named-compilezone.ilk
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
      </Link>
      <PostBuildEvent>
diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in

index df2ba60b0318b096d640ed45cad1ee02f0b11f5b..141763e26e269c3a028ec488062ca424d1a1824a 100644 (file)
--- a/bin/confgen/win32/rndcconfgen.vcxproj.in
+++ b/bin/confgen/win32/rndcconfgen.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/confgen/win32/tsigkeygen.vcxproj.in b/bin/confgen/win32/tsigkeygen.vcxproj.in

index c12dd1c0b0f8de606bea78ed6374a48e969fa051..1664c0b23624a024bd6aa35301181bbf3506bd4e 100644 (file)
--- a/bin/confgen/win32/tsigkeygen.vcxproj.in
+++ b/bin/confgen/win32/tsigkeygen.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>cd ..\..\..\Build\$(Configuration)
@@ -115,7 +115,7 @@ copy /Y tsig-keygen.ilk ddns-confgen.ilk
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>cd ..\..\..\Build\$(Configuration)
diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in

index 0ae7565b76c994376824ff09dd1916ae85209999..135f51f80e7ead647947db1b26798377753bf033 100644 (file)
--- a/bin/delv/win32/delv.vcxproj.in
+++ b/bin/delv/win32/delv.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in

index 33632379e486b523b72a8081a31f8b1a89804047..ca020168a685152c5bb78e9cea6b2deb3570bbfd 100644 (file)
--- a/bin/dig/win32/dig.vcxproj.in
+++ b/bin/dig/win32/dig.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in

index 1851fd32750a098222e1f93e3fa948f1e3a8191a..8b6d302e65976e7a031fec935e0ba64533e1c872 100644 (file)
--- a/bin/dig/win32/host.vcxproj.in
+++ b/bin/dig/win32/host.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in

index babc99883e1a949720d6fbcc06f00b4ee8cf35d2..0ff4268001cdee95239f975bf54bdc7ca89d1583 100644 (file)
--- a/bin/dig/win32/nslookup.vcxproj.in
+++ b/bin/dig/win32/nslookup.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in

index 2c9ce759f397396bb939c1cb187dbed0d59a4d8d..8328a277f5af1229d752062adc41f99472af40e4 100644 (file)
--- a/bin/dnssec/win32/cds.vcxproj.in
+++ b/bin/dnssec/win32/cds.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in

index 16585e6348fe7af1c6fb9f5719c60466156934d4..be24c8d377231e08235d52249c5ca69d96021a99 100644 (file)
--- a/bin/dnssec/win32/dsfromkey.vcxproj.in
+++ b/bin/dnssec/win32/dsfromkey.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
  @IF PYTHON
      <PostBuildEvent>
@@ -122,7 +122,7 @@ set PYTHONPATH=.
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
  @IF PYTHON
      <PostBuildEvent>
diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in

index 6be1ce1e76cc70b16a45cc3833a07a8a7df5b8a2..ef137a173bf759fc8324ed721c40980181037cc5 100644 (file)
--- a/bin/dnssec/win32/importkey.vcxproj.in
+++ b/bin/dnssec/win32/importkey.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in

index d4e0f859119b65be673f30e8dd2469e63fbdd4fc..5b5a898d68df909cd1499ac2018172a5c9995079 100644 (file)
--- a/bin/dnssec/win32/keyfromlabel.vcxproj.in
+++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in

index 58c1e408e1be5fc61b7e09c91a20b3abc54e8998..ad93ba379672356186918fe7e99b6c8a3ccd3692 100644 (file)
--- a/bin/dnssec/win32/keygen.vcxproj.in
+++ b/bin/dnssec/win32/keygen.vcxproj.in
@@ -76,7 +76,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libisccfg.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in

index cf4174a4e6bf9e12ca4727a8a232503deff80125..03eb175507eefab3566a6632b785ba63804c328d 100644 (file)
--- a/bin/dnssec/win32/revoke.vcxproj.in
+++ b/bin/dnssec/win32/revoke.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in

index 22b45d93dd6f4019308980bfc1c255c74ee73d72..505f299ad538c37bc485df53e1ccc692a4c2fc73 100644 (file)
--- a/bin/dnssec/win32/settime.vcxproj.in
+++ b/bin/dnssec/win32/settime.vcxproj.in
@@ -76,7 +76,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in

index f7b0f5c018fec626311d76277b14517726e93655..b53c10c15b9a343479249807156d14ab23bdc523 100644 (file)
--- a/bin/dnssec/win32/signzone.vcxproj.in
+++ b/bin/dnssec/win32/signzone.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in

index 748e48f110e587350604aa8a98b4a71bc152e2af..9eab75887cf3b17dd937d3e8e2bb5e9018e8c23d 100644 (file)
--- a/bin/dnssec/win32/verify.vcxproj.in
+++ b/bin/dnssec/win32/verify.vcxproj.in
@@ -76,7 +76,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalDependencies>@OPENSSL_LIB@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@dnssectool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      </Link>
    </ItemDefinitionGroup>
diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in

index cd3d934ead386db06f8d131dd91cf78bc8ad7d77..73f091ea9cf60c3e366ba3297a477986da91229e 100644 (file)
--- a/bin/named/win32/named.vcxproj.in
+++ b/bin/named/win32/named.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\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)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
      </Link>
      <PreBuildEvent>
        <Command>cd ..
@@ -114,7 +114,7 @@ perl -e "print \";\";" &gt;&gt; xsl.c
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\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)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
      </Link>
      <PreBuildEvent>
        <Command>cd ..
diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in

index 00a93794be82a18d941ab268ef65b36b668963bf..8bf3eb4453b11a5ed2dd9b84b72514dad41e3a79 100644 (file)
--- a/bin/nsupdate/win32/nsupdate.vcxproj.in
+++ b/bin/nsupdate/win32/nsupdate.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in

index 842581dc317de940ae24a0b6e7dd4bca751fe04e..fb2ff897615f4029eb57f95ba06f463c9a9d63bb 100644 (file)
--- a/bin/pkcs11/win32/pk11destroy.vcxproj.in
+++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in

index 3655c875605b6f42fa53e2ca0d7d46cad9a42a3d..5c58ad11712f755f6c0d8b571e6eb7d33f64ad53 100644 (file)
--- a/bin/pkcs11/win32/pk11keygen.vcxproj.in
+++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in

index 7425207197bc9587a1fce5e1424d893e92b03e6c..80d7a0872687038b5318a07b9fb7a3b8541e4ead 100644 (file)
--- a/bin/pkcs11/win32/pk11list.vcxproj.in
+++ b/bin/pkcs11/win32/pk11list.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in

index eb3415472a7fb141d35e42515a0b93c2471cabc6..9b38ccee3c7e7bd6005c249c5d7b5e692497b6ef 100644 (file)
--- a/bin/pkcs11/win32/pk11tokens.vcxproj.in
+++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in

index df7c3a91447134f1dfb9520b84e46edebddd7b21..1e8ca06776400d549244e963aef4d52d767558e6 100644 (file)
--- a/bin/rndc/win32/rndc.vcxproj.in
+++ b/bin/rndc/win32/rndc.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in

index 61daea6799616b9bc6d35f026c4423c243255253..f5b14e6ad2d35f36ffdc04f1cb1fa9e5b66ae9c7 100644 (file)
--- a/bin/tests/system/win32/feature-test.vcxproj.in
+++ b/bin/tests/system/win32/feature-test.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in

index 4af9da949ed11ca157345a1850ba5179b0c87b02..cff4647a456d28f662e63554b6ff59da396f46ee 100644 (file)
--- a/bin/tests/system/win32/gencheck.vcxproj.in
+++ b/bin/tests/system/win32/gencheck.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in

index 0f6883ca8f5be615586e66da903e581e12398ff7..656b3017d569f5102e63f30d43c8efb6077e4d5e 100644 (file)
--- a/bin/tests/system/win32/keycreate.vcxproj.in
+++ b/bin/tests/system/win32/keycreate.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in

index 59b805cf160a9c37683fd234114c6810ef0a9ed7..8a6943bc4834d603f803ac955f4ec6b78935f797 100644 (file)
--- a/bin/tests/system/win32/keydelete.vcxproj.in
+++ b/bin/tests/system/win32/keydelete.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/makejournal.vcxproj.in b/bin/tests/system/win32/makejournal.vcxproj.in

index 13cb6d13f51ec649f696a6d0539eda6c68667127..139dfc856f9e60b88cdcbbba6057a2e5eed5e2c7 100644 (file)
--- a/bin/tests/system/win32/makejournal.vcxproj.in
+++ b/bin/tests/system/win32/makejournal.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in

index 752beff7400cf508e4e4ca32b802498ab2d5d3ea..870811ba34dc888240f56aead78148b2e0155a32 100644 (file)
--- a/bin/tests/system/win32/pipequeries.vcxproj.in
+++ b/bin/tests/system/win32/pipequeries.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBXML2_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in

index 179a699b7bfe7badb0ac50889108c11785f2ece0..a601b50326534a9e56c7f3b4bafca5795e0ea1ab 100644 (file)
--- a/bin/tools/win32/arpaname.vcxproj.in
+++ b/bin/tools/win32/arpaname.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in

index 8ccb70d9edb049db7a953176b221711e9b19b374..08fbaa9dc4146d212c93210370bcb31a91ad0115 100644 (file)
--- a/bin/tools/win32/journalprint.vcxproj.in
+++ b/bin/tools/win32/journalprint.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in

index d0d86c2da01f1236b27890a968ed93dc13f586b3..fdaaa82bfb2a658e1cc6d709bd9b2e301dbfc1ff 100644 (file)
--- a/bin/tools/win32/mdig.vcxproj.in
+++ b/bin/tools/win32/mdig.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in

index 17c014fb9efe8e217bc8bb6636e7c380982cb5de..33f648382e9b9d50463180efb675c0d10f2e4e4a 100644 (file)
--- a/bin/tools/win32/nsec3hash.vcxproj.in
+++ b/bin/tools/win32/nsec3hash.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in

index e95fbe3dc97c9cb6c947b95b9a3bdcdb66e9b5b7..14e4a6145ce223af5f061ff54b1affcc31434e31 100644 (file)
--- a/bin/tools/win32/rrchecker.vcxproj.in
+++ b/bin/tools/win32/rrchecker.vcxproj.in
@@ -77,7 +77,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -109,7 +109,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in

index 001865cf08f846c307a09498c9d195f8e23087ee..a8be6ec1268788437cbf3fad1a6a7072c71802e8 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in
+++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in
@@ -79,7 +79,7 @@
        <SubSystem>Windows</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@nafxcwd.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@nafxcwd.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <EnableUAC>false</EnableUAC>
      </Link>
    </ItemDefinitionGroup>
@@ -110,7 +110,7 @@
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@nafxcw.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@nafxcw.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <EnableUAC>false</EnableUAC>
      </Link>
diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in

index d483e97006e81e2e4d7ad52043612455bda3d1ac..fe9d00b9bddcc2b48d5e0fdce3b8f7453de7ec5d 100644 (file)
--- a/lib/bind9/win32/libbind9.vcxproj.in
+++ b/lib/bind9/win32/libbind9.vcxproj.in
@@ -74,7 +74,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
@@ -107,7 +107,7 @@
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in

index cc008979dd174c67c970082dac6f4f28aadec21b..e08156afee6baac9d748203ff0ce47202dde11e0 100644 (file)
--- a/lib/dns/win32/libdns.vcxproj.in
+++ b/lib/dns/win32/libdns.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
      </Link>
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;@LIBXML2_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in

index 1b39b3c73f2fbc2ce3e20dc146e9cc9931d7bdf7..b5a96a0b115f65b6b8d6748bf392ee58478a9693 100644 (file)
--- a/lib/irs/win32/libirs.vcxproj.in
+++ b/lib/irs/win32/libirs.vcxproj.in
@@ -74,7 +74,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>.\libirs.def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
@@ -107,7 +107,7 @@
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>.\libirs.def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in

index 9da70435f0f150b53ae8ca5ad87c847a0b68595a..e785ed73cf95c33d89f15b2e936497b538baf388 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -80,7 +80,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
      </Link>
@@ -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\
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>@OPENSSL_LIB@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@@LIBUV_LIB@@LIBXML2_LIB@@ZLIB_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -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 0508dfd7b622b1c100a2fcefd76b0b2a50012ce7..b4297cec170dff167120e72d7054a38b96bc2330 100644 (file)
--- a/lib/isccc/win32/libisccc.vcxproj.in
+++ b/lib/isccc/win32/libisccc.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
      </Link>
@@ -108,7 +108,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in

index 27811bbba44b8e83f337892f416a73c0ae83c340..c828431b5f70ae3f11ac319ae8837674225a9bc0 100644 (file)
--- a/lib/isccfg/win32/libisccfg.vcxproj.in
+++ b/lib/isccfg/win32/libisccfg.vcxproj.in
@@ -74,7 +74,7 @@
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <AdditionalLibraryDirectories>..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
@@ -107,7 +107,7 @@
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
        <AdditionalLibraryDirectories>..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in

index 41604ba1716ba847a7287ac66307a565df5629e6..02a97435fbf8e332000e30075d7ee3c5a6412342 100644 (file)
--- a/lib/ns/win32/libns.vcxproj.in
+++ b/lib/ns/win32/libns.vcxproj.in
@@ -74,7 +74,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
      </Link>
@@ -107,7 +107,7 @@
        <OptimizeReferences>true</OptimizeReferences>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIB@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@LIBUV_LIB@@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
        <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in

index 960e4fd4cbc19270c9053ec29300de25483d6841..37a071bdf37b4edc894b4a1aac4019dda7d5a6fe 100644 (file)
--- a/lib/samples/win32/async.vcxproj.in
+++ b/lib/samples/win32/async.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in

index 65b61e426c88a556a9c2955a8961ba8da1f6fd80..4581683f27f478f078167fc2a1af9d08e4a477a7 100644 (file)
--- a/lib/samples/win32/nsprobe.vcxproj.in
+++ b/lib/samples/win32/nsprobe.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in

index 9ba7f32c953f617ae9a24d2b5ac32c5b4e82554b..40045e37814cec54be68e1a8843041351243c067 100644 (file)
--- a/lib/samples/win32/request.vcxproj.in
+++ b/lib/samples/win32/request.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in

index 34941439aa722c8ba152c37acb8f7da9bb4a80de..9923514663f49f0d145539f392c128fdc9c372eb 100644 (file)
--- a/lib/samples/win32/resolve.vcxproj.in
+++ b/lib/samples/win32/resolve.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in

index 814e7f93c6d0eaca95e167a20385ca2d3c64c8f0..7e125d77a4483ab0b722065f641d9cb83359ae43 100644 (file)
--- a/lib/samples/win32/update.vcxproj.in
+++ b/lib/samples/win32/update.vcxproj.in
@@ -75,7 +75,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -107,7 +107,7 @@
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
        <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>@OPENSSL_LIBCRYPTO@@OPENSSL_LIBSSL@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
diff --git a/win32utils/Configure b/win32utils/Configure

index 7f86b54cba51c99cdce3b2f7d45b1aec570573ff..e8ec8a3684c9d5e706819f5715ce2c2b227889c5 100644 (file)
--- 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 <openssl/err.h>
@@ -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 <openssl/ssl.h>
+
+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") {
author	Ondřej Surý <ondrej@isc.org>
	Sat, 10 Oct 2020 05:26:18 +0000 (07:26 +0200)
committer	Ondřej Surý <ondrej@isc.org>
	Mon, 9 Nov 2020 15:00:28 +0000 (16:00 +0100)
bin/check/win32/checkconf.vcxproj.in		patch \| blob \| blame \| history
bin/check/win32/checkzone.vcxproj.in		patch \| blob \| blame \| history
bin/confgen/win32/rndcconfgen.vcxproj.in		patch \| blob \| blame \| history
bin/confgen/win32/tsigkeygen.vcxproj.in		patch \| blob \| blame \| history
bin/delv/win32/delv.vcxproj.in		patch \| blob \| blame \| history
bin/dig/win32/dig.vcxproj.in		patch \| blob \| blame \| history
bin/dig/win32/host.vcxproj.in		patch \| blob \| blame \| history
bin/dig/win32/nslookup.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/cds.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/dsfromkey.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/importkey.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/keyfromlabel.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/keygen.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/revoke.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/settime.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/signzone.vcxproj.in		patch \| blob \| blame \| history
bin/dnssec/win32/verify.vcxproj.in		patch \| blob \| blame \| history
bin/named/win32/named.vcxproj.in		patch \| blob \| blame \| history
bin/nsupdate/win32/nsupdate.vcxproj.in		patch \| blob \| blame \| history
bin/pkcs11/win32/pk11destroy.vcxproj.in		patch \| blob \| blame \| history
bin/pkcs11/win32/pk11keygen.vcxproj.in		patch \| blob \| blame \| history
bin/pkcs11/win32/pk11list.vcxproj.in		patch \| blob \| blame \| history
bin/pkcs11/win32/pk11tokens.vcxproj.in		patch \| blob \| blame \| history
bin/rndc/win32/rndc.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/feature-test.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/gencheck.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/keycreate.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/keydelete.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/makejournal.vcxproj.in		patch \| blob \| blame \| history
bin/tests/system/win32/pipequeries.vcxproj.in		patch \| blob \| blame \| history
bin/tools/win32/arpaname.vcxproj.in		patch \| blob \| blame \| history
bin/tools/win32/journalprint.vcxproj.in		patch \| blob \| blame \| history
bin/tools/win32/mdig.vcxproj.in		patch \| blob \| blame \| history
bin/tools/win32/nsec3hash.vcxproj.in		patch \| blob \| blame \| history
bin/tools/win32/rrchecker.vcxproj.in		patch \| blob \| blame \| history
bin/win32/BINDInstall/BINDInstall.vcxproj.in		patch \| blob \| blame \| history
lib/bind9/win32/libbind9.vcxproj.in		patch \| blob \| blame \| history
lib/dns/win32/libdns.vcxproj.in		patch \| blob \| blame \| history
lib/irs/win32/libirs.vcxproj.in		patch \| blob \| blame \| history
lib/isc/win32/libisc.vcxproj.in		patch \| blob \| blame \| history
lib/isccc/win32/libisccc.vcxproj.in		patch \| blob \| blame \| history
lib/isccfg/win32/libisccfg.vcxproj.in		patch \| blob \| blame \| history
lib/ns/win32/libns.vcxproj.in		patch \| blob \| blame \| history
lib/samples/win32/async.vcxproj.in		patch \| blob \| blame \| history
lib/samples/win32/nsprobe.vcxproj.in		patch \| blob \| blame \| history
lib/samples/win32/request.vcxproj.in		patch \| blob \| blame \| history
lib/samples/win32/resolve.vcxproj.in		patch \| blob \| blame \| history
lib/samples/win32/update.vcxproj.in		patch \| blob \| blame \| history
win32utils/Configure		patch \| blob \| blame \| history