Merged rt42505 (misc DNSSEC bugs)

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index 09d1fa8b23e3de83f586ad1e251eaa10f0a509be..7cde5eb83cac9e217d6227ec38097dc187eae8a9 100644 (file)
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -617,7 +617,7 @@
     </para>
     <para>
       Both <filename>.key</filename> and <filename>.private</filename>
-      files are generated for symmetric encryption algorithms such as
+      files are generated for symmetric cryptography algorithms such as
       HMAC-MD5, even though the public and private key are equivalent.
     </para>
   </refsection>

diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in
index b23c6064da73642c15ce5dfd46c7afd0fbd48105..c0dd3caf57db974ed5c537a3a270d6af489aa539 100644 (file)
--- a/bin/pkcs11/win32/pk11destroy.vcxproj.in
+++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in
@@ -47,6 +47,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
     <IntDir>.\$(Configuration)\</IntDir>
+    <TargetName>pkcs11-destroy</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
     <ClCompile>

diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in
index 0491f221c48344d766a2bfd53872495946e8f9c3..b3810c2ec9ad8ce80353614aacd88b80b0d254ba 100644 (file)
--- a/bin/pkcs11/win32/pk11tokens.vcxproj.in
+++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in
@@ -47,6 +47,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
     <IntDir>.\$(Configuration)\</IntDir>
+    <TargetName>pkcs11-tokens</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
     <ClCompile>

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 1ab10e4481c987a7461f7753fa7ff8bb8e3efa20..47c40105eeb45ea2a1c1a534aff62c8d1713d2d2 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1608,6 +1608,11 @@ issymmetric(const dst_key_t *key) {
        case DST_ALG_ECDSA384:
                return (ISC_FALSE);
        case DST_ALG_HMACMD5:
+       case DST_ALG_HMACSHA1:
+       case DST_ALG_HMACSHA224:
+       case DST_ALG_HMACSHA256:
+       case DST_ALG_HMACSHA384:
+       case DST_ALG_HMACSHA512:
        case DST_ALG_GSSAPI:
                return (ISC_TRUE);
        default:

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index a3c016b944fa5447ab29c49be82b4fc2de70b976..9333dd51d36f81198e5afffc0a17371b0edbaab4 100644 (file)
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -321,7 +321,7 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
                result = PK11_R_NODIGESTSERVICE;
                goto unlock;
        }
-#if defined(AES_SIT)
+#if defined(AES_CC)
        if (aes_token == NULL) {
                result = PK11_R_NOAESSERVICE;
                goto unlock;