Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
2a8aa104
Commit
2a8aa104
authored
Jun 01, 2016
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged rt42505 (misc DNSSEC bugs)
parent
b6219586
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
2 deletions
+9
-2
bin/dnssec/dnssec-keygen.docbook
bin/dnssec/dnssec-keygen.docbook
+1
-1
bin/pkcs11/win32/pk11destroy.vcxproj.in
bin/pkcs11/win32/pk11destroy.vcxproj.in
+1
-0
bin/pkcs11/win32/pk11tokens.vcxproj.in
bin/pkcs11/win32/pk11tokens.vcxproj.in
+1
-0
lib/dns/dst_api.c
lib/dns/dst_api.c
+5
-0
lib/isc/pk11.c
lib/isc/pk11.c
+1
-1
No files found.
bin/dnssec/dnssec-keygen.docbook
View file @
2a8aa104
...
...
@@ -617,7 +617,7 @@
</para>
<para>
Both <filename>.key</filename> and <filename>.private</filename>
files are generated for symmetric
en
crypt
ion
algorithms such as
files are generated for symmetric crypt
ography
algorithms such as
HMAC-MD5, even though the public and private key are equivalent.
</para>
</refsection>
...
...
bin/pkcs11/win32/pk11destroy.vcxproj.in
View file @
2a8aa104
...
...
@@ -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>
...
...
bin/pkcs11/win32/pk11tokens.vcxproj.in
View file @
2a8aa104
...
...
@@ -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>
...
...
lib/dns/dst_api.c
View file @
2a8aa104
...
...
@@ -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:
...
...
lib/isc/pk11.c
View file @
2a8aa104
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment