From 07e35360e4dc6bd145c752e6f9cff57b0d0065c1 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Wed, 1 Jun 2016 09:28:40 +0200
Subject: [PATCH] Merged rt42505 (misc DNSSEC bugs)

---
 bin/dnssec/dnssec-keygen.docbook        | 2 +-
 bin/pkcs11/win32/pk11destroy.vcxproj.in | 1 +
 bin/pkcs11/win32/pk11tokens.vcxproj.in  | 1 +
 lib/dns/dst_api.c                       | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index 25708a7c52..d3923a0a78 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -594,7 +594,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 b23c6064da..c0dd3caf57 100644
--- 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 0491f221c4..b3810c2ec9 100644
--- 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 30e569e5b3..9d886f9bf8 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1576,6 +1576,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: