diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index b48967d57b..158082fa27 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index 98dc52927f..af1c5c7abf 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -58,7 +58,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -80,7 +80,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index b2a93d2ab5..9ddbb9f257 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -87,7 +87,7 @@ copy /Y named-checkzone.ilk named-compilezone.ilk MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index da98e50bfe..0c63137c3c 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 7242bc1b7d..65fa3a2d1c 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 7940eca659..98a9f0e17d 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -77,7 +77,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 05a269b533..0d717ebf97 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index a3f7f233a4..723732b103 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index 7d6b3da7c2..57ed65c492 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -61,7 +61,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -84,7 +84,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index b58fc1a2bb..e574a7f9f7 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -94,7 +94,7 @@ set PYTHONPATH=. MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index 92f7dacf77..9bb1ba0b54 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index d1f6eca3c0..9d83c51e38 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index b4259cad93..b59ae38081 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index 91c0607207..0ae342cfe5 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 0b68c400d0..037436bffe 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index 0b9a9f6ab9..544f4701b5 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index 251a893f9d..a0bfd3b41e 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -55,7 +55,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(ProjectName).pch .\$(Configuration)\ @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index 6ee57b9497..18c2c6bc23 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@@USE_GSSAPI@BUILDER="Visual Studio";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@BUILDER="Visual Studio";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index c89e648103..bc354b55f0 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@@USE_GSSAPI@USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tests/system/win32/bigkey.vcxproj.in b/bin/tests/system/win32/bigkey.vcxproj.in index 45bfa4d005..e996da9cd2 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index 11eecc19dd..6991937a2a 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index 878ef8dcbd..d8e46e8559 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index 2e06b46963..19a45cb68a 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index ca6d334311..b07138318f 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index 305a83949b..a05ae71f00 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;@CRYPTO@_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -79,7 +79,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 255b72b27a..ff46023640 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -55,7 +55,7 @@ Use Level3 Disabled - WIN32;@CRYPTO@@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions) ..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) @@ -85,7 +85,7 @@ MaxSpeed true false - WIN32;@CRYPTO@@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;%(PreprocessorDefinitions) ..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) OnlyExplicitInline true @@ -123,8 +123,8 @@ NotUsing - UNICODE;WIN32;@CRYPTO@@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;_MBCS - UNICODE;WIN32;@CRYPTO@@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;_MBCS + UNICODE;WIN32;@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;_MBCS + UNICODE;WIN32;@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;_MBCS diff --git a/config.h.win32 b/config.h.win32 index 40e7262ed2..09348685d2 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -333,6 +333,9 @@ typedef __int64 off_t; /* Define if your OpenSSL version supports RSA functions. */ @HAVE_RSA_SET0_KEY@ +/* define if OpenSSL is used for Public-Key Cryptography */ +@USE_OPENSSL@ + /* Define if native PKCS#11 is used as cryptographic library provider */ @USE_PKCS11@ diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index c1a815b24b..8541658fdd 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;NDEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) ./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline false diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in index 89a894c0fc..7617381da9 100644 --- a/lib/dns/win32/libdns.vcxproj.filters.in +++ b/lib/dns/win32/libdns.vcxproj.filters.in @@ -299,7 +299,6 @@ Dst Source Files -@IF OPENSSL Dst Source Files @@ -318,7 +317,6 @@ Dst Source Files -@END OPENSSL @IF PKCS11 Dst Source Files @@ -658,11 +656,9 @@ Dst Header Files -@IF OPENSSL Dst Header Files -@END OPENSSL Dst Header Files diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index 479daa14a5..c432d3b475 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;WIN32;USE_MD5;@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;WIN32;USE_MD5;@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline true @@ -160,14 +160,12 @@ -@IF OPENSSL -@END OPENSSL @IF PKCS11 @@ -222,9 +220,7 @@ -@IF OPENSSL -@END OPENSSL @IF PKCS11 diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index 96af09ba90..99c0ea40b4 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;_DEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\isccfg\include;..\..\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;NDEBUG;_WINDOWS;_USRDLL;LIBIRS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\isccfg\include;..\..\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline false diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in index 2608d0fd11..6f61d6b13e 100644 --- a/lib/isc/win32/libisc.def.in +++ b/lib/isc/win32/libisc.def.in @@ -108,11 +108,9 @@ isc__task_unsendrange isc__taskmgr_mode isc__taskmgr_pause isc__taskmgr_resume -@IF AES isc_aes128_crypt isc_aes192_crypt isc_aes256_crypt -@END AES isc_app_block isc_app_ctxfinish isc_app_ctxonrun diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in index 49d1bdf890..f27963d40e 100644 --- a/lib/isc/win32/libisc.vcxproj.filters.in +++ b/lib/isc/win32/libisc.vcxproj.filters.in @@ -26,11 +26,9 @@ -@IF AES Library Header Files -@END AES Library Header Files @@ -481,11 +479,9 @@ Win32 Source Files @END PKCS11 -@IF AES Win32 Source Files -@END AES Library Source Files diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 2a72d89779..e824ccd768 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -54,7 +54,7 @@ Level3 Disabled @IF PKCS11 - BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories) @ELSE PKCS11 BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) @@ -86,12 +86,10 @@ echo Copying COPYRIGHT notice. copy ..\COPYRIGHT ..\Build\Debug -@IF OPENSSL echo Copying the OpenSSL DLL and LICENSE. copy @OPENSSL_DLL@ ..\Build\Debug\ copy @OPENSSL_PATH@\LICENSE ..\Build\Debug\OpenSSL-LICENSE -@END OPENSSL @IF LIBXML2 echo Copying the libxml DLL. @@ -149,7 +147,7 @@ copy InstallFiles ..\Build\Debug\ true @INTRINSIC@ @IF PKCS11 - BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;@PK11_LIB_LOCATION@WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@ZLIB_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories) @ELSE PKCS11 BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) @@ -235,12 +233,10 @@ echo Copying the migration notes. copy ..\doc\misc\migration ..\Build\Release copy ..\doc\misc\migration-4to9 ..\Build\Release -@IF OPENSSL echo Copying the OpenSSL DLL and LICENSE. copy @OPENSSL_DLL@ ..\Build\Release\ copy @OPENSSL_PATH@\LICENSE ..\Build\Release\OpenSSL-LICENSE -@END OPENSSL @IF LIBXML2 echo Copying the libxml DLL. @@ -294,9 +290,7 @@ copy InstallFiles ..\Build\Release\ -@IF AES -@END AES @@ -425,9 +419,7 @@ copy InstallFiles ..\Build\Release\ -@IF AES -@END AES diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index 0ba2049d0d..82cbac6e32 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;NDEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories) OnlyExplicitInline true diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 74a445f6e3..96e351ea0f 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -53,7 +53,7 @@ Level3 Disabled - WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;_DEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -81,7 +81,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + WIN32;USE_MD5;NDEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline true diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index 9491921c20..33256a2bd6 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -52,7 +52,7 @@ Level3 Disabled - WIN32;@CRYPTO@@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch @@ -80,7 +80,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@CRYPTO@@USE_GSSAPI@NDEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + WIN32;@USE_GSSAPI@NDEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline true diff --git a/win32utils/Configure b/win32utils/Configure index 0c1bfc255b..b8f8ae2b7c 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -207,6 +207,7 @@ my @substdefh = ("AES_CC", "HAVE_DSA_GET0_PQG", "HAVE_ECDSA_SIG_GET0", "HAVE_RSA_SET0_KEY", + "USE_OPENSSL", "USE_PKCS11", "HAVE_PKCS11_ED25519", "HAVE_PKCS11_ED448", @@ -321,10 +322,8 @@ my @substvar = ("BIND9_VERSION", my %configdefd; -my @substdefd = ("CRYPTO", - "PK11_LIB_LOCATION", +my @substdefd = ("PK11_LIB_LOCATION", "USE_GSSAPI", - "USE_PKCS11", "USE_PYTHON", "USE_ISC_SPNEGO"); @@ -332,8 +331,7 @@ my @substdefd = ("CRYPTO", my %configcond; -my @substcond = ("AES", - "ATOMIC", +my @substcond = ("ATOMIC", "GSSAPI", "GEOIP", "IDNKIT", @@ -426,11 +424,9 @@ my @help = ( " with-extra-tests build with extra test suite\n", " with-system-tests build with system test suite\n", " with-samples build with sample programs\n", -" with-openssl[=PATH] build with OpenSSL yes|no|path\n", +" with-openssl[=PATH] build with OpenSSL yes|path (mandatory)\n", " with-pkcs11[=PATH] build with PKCS#11 support yes|no|provider-path\n", -" with-ecdsa crypto ECDSA\n", " with-eddsa crypto EDDSA yes|all|no\n", -" with-aes crypto AES\n", " with-cc-alg choose the algorithm for cookies aes|sha1|sha256\n", " with-gssapi[=PATH] build with MIT KfW GSSAPI yes|no|path\n", " with-libxml2[=PATH] build with libxml2 library yes|no|path\n", @@ -1265,8 +1261,6 @@ if ($enable_native_pkcs11 eq "yes") { print "native PKCS#11 support: no PKCS#11 provider defined?\n"; } } - $configdefd{"CRYPTO"} = "PKCS11CRYPTO"; - $configdefh{"USE_PKCS11"} = 1; if ($use_eddsa eq "no") { if ($verbose) { print "no EDDSA support in native PKCS#11\n"; @@ -1287,16 +1281,6 @@ if ($enable_native_pkcs11 eq "yes") { $configdefh{"HAVE_PKCS11_ED448"} = 1; } } - if ($use_aes eq "no") { - if ($verbose) { - print "no AES support in native PKCS#11\n"; - } - } else { - if ($verbose) { - print "enabled AES support in native PKCS#11\n"; - } - $use_aes = "pkcs11"; - } } # enable-fixed-rrset @@ -1430,14 +1414,18 @@ if ($use_openssl eq "yes") { } $cryptolib = "openssl"; - $configcond{"OPENSSL"} = 1; - $configdefd{"CRYPTO"} = "OPENSSL"; $configvar{"OPENSSL_PATH"} = "$openssl_path"; $configinc{"OPENSSL_INC"} = "$openssl_inc"; $configlib{"OPENSSL_LIB"} = "$openssl_lib"; $configdll{"OPENSSL_DLL"} = "$openssl_dll"; } +if ($cryptolib eq "openssl") { + $configdefh{"USE_OPENSSL"} = 1; +} else { + $configdefh{"USE_PKCS11"} = 1; +} + # check OpenSSL if ($use_openssl eq "yes") { if ($verbose) { @@ -1673,89 +1661,6 @@ if ($use_openssl eq "no") { $use_aes = "no"; } } -if ($use_aes eq "auto") { - if ($verbose) { - print "checking for OpenSSL EVP AES support\n"; - } - $use_aes = "evp"; - open F, ">testevpaes.c" || die $!; - print F << 'EOF'; -#include - -int -main(void) -{ - EVP_CIPHER *aes128, *aes192, *aes256; - - aes128 = EVP_aes_128_ecb(); - aes192 = EVP_aes_192_ecb(); - aes256 = EVP_aes_256_ecb(); - if (aes128 == NULL || aes192 == NULL || aes256 == NULL) - return (1); - return (0); -} -EOF - close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" testevpaes.c "$library"`; - if (grep { -f and -x } ".\\testevpaes.exe") { - `.\\testevpaes.exe`; - if ($? != 0) { - if ($verbose) { - print "EVP AES test failed: disabling EVP AES\n"; - } - $use_aes = "auto"; - } - } else { - if ($verbose) { - print "can't compile EVP AES test: $compret\n"; - print "disabling EVP AES\n"; - } - $use_aes = "auto"; - } -} - -if ($use_aes eq "auto") { - if ($verbose) { - print "checking for OpenSSL native AES support\n"; - } - $use_aes = "native"; - open F, ">testaes.c" || die $!; - print F << 'EOF'; -#include - -AES_KEY k; -const unsigned char bufin[16]; -unsigned char bufout[16]; - -int -main(void) -{ - AES_encrypt(bufin, bufout, &k); - return (0); -} -EOF - close F; - my $include = $configinc{"OPENSSL_INC"}; - my $library = $configlib{"OPENSSL_LIB"}; - $compret = `cl /nologo /MD /I "$include" testaes.c "$library"`; - if (grep { -f and -x } ".\\testaes.exe") { - `.\\testaes.exe`; - if ($? != 0) { - if ($verbose) { - print "native AES test failed: disabling AES\n"; - } - $use_aes = "no"; - } - } else { - if ($verbose) { - print "can't compile native AES test: $compret\n"; - print "disabling AES\n"; - } - $use_aes = "no"; - } -} # with-cc-alg if ($cookie_algorithm eq "aes") { @@ -1778,7 +1683,6 @@ if ($cryptolib ne "") { # with-pkcs11 if ($use_pkcs11 ne "no") { $configcond{"PKCS11"} = 1; - $configdefd{"USE_PKCS11"} = "USE_PKCS11"; $configvar{"PKCS11_TOOLS"} = "pkcs11"; $configdefd{"PK11_LIB_LOCATION"} = "PK11_LIB_LOCATION=\"$pkcs11_path\""; }