mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merged rt42505 (misc DNSSEC bugs)

Browse Source
This commit is contained in:
Francis Dupont
2016-06-01 09:18:49 +02:00
parent b621958613
commit 2a8aa10492
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/dnssec/dnssec-keygen.docbook
View File

@@ -617,7 +617,7 @@
</para> </para>
<para> <para>
Both <filename>.key</filename> and <filename>.private</filename> 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. HMAC-MD5, even though the public and private key are equivalent.
</para> </para>
</refsection> </refsection>

1
bin/pkcs11/win32/pk11destroy.vcxproj.in
View File

@@ -47,6 +47,7 @@
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<OutDir>..\..\..\Build\$(Configuration)\</OutDir> <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
<IntDir>.\$(Configuration)\</IntDir> <IntDir>.\$(Configuration)\</IntDir>
<TargetName>pkcs11-destroy</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
<ClCompile> <ClCompile>

1
bin/pkcs11/win32/pk11tokens.vcxproj.in
View File

@@ -47,6 +47,7 @@
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<OutDir>..\..\..\Build\$(Configuration)\</OutDir> <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
<IntDir>.\$(Configuration)\</IntDir> <IntDir>.\$(Configuration)\</IntDir>
<TargetName>pkcs11-tokens</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
<ClCompile> <ClCompile>

5
lib/dns/dst_api.c
View File

@@ -1608,6 +1608,11 @@ issymmetric(const dst_key_t *key) {
case DST_ALG_ECDSA384: case DST_ALG_ECDSA384:
return (ISC_FALSE); return (ISC_FALSE);
case DST_ALG_HMACMD5: 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: case DST_ALG_GSSAPI:
return (ISC_TRUE); return (ISC_TRUE);
default: default:

2
lib/isc/pk11.c
View File

@@ -321,7 +321,7 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
result = PK11_R_NODIGESTSERVICE; result = PK11_R_NODIGESTSERVICE;
goto unlock; goto unlock;
} }
#if defined(AES_SIT) #if defined(AES_CC)
if (aes_token == NULL) { if (aes_token == NULL) {
result = PK11_R_NOAESSERVICE; result = PK11_R_NOAESSERVICE;
goto unlock; goto unlock;