Commit 2a8aa104 authored by Francis Dupont's avatar Francis Dupont

Merged rt42505 (misc DNSSEC bugs)

parent b6219586
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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:
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment