ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '996-revert-wrong-key-id-is-displayed-for-rsamd5-keys' into 'master'

Browse Source 
Revert "Merge branch '996-wrong-key-id-is-displayed-for-rsamd5-keys' into 'master'"

Closes #996

See merge request isc-projects/bind9!1981
This commit is contained in:
Ondřej Surý
2019-05-29 10:14:21 -04:00
parent bdde335cca 52a8fb31c7
commit ebbedd6c03
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
5240. [bug] Remove key id calculation for RSAMD5. [GL #996]
5239. [func] Change the json-c detection to pkg-config. [GL #855]
5238. [bug] Fix a possible deadlock in TCP code. [GL #1046]

24
lib/dns/key.c
View File

@@ -35,17 +35,11 @@ dst_region_computeid(const isc_region_t *source) {
p = source->base;
size = source->length;
if (source->base[3] == DST_ALG_RSAMD5) {
return ((p[size - 3] << 8) + p[size - 2]);
}
for (ac = 0; size > 1; size -= 2, p += 2) {
for (ac = 0; size > 1; size -= 2, p += 2)
ac += ((*p) << 8) + *(p + 1);
}
if (size > 0) {
if (size > 0)
ac += ((*p) << 8);
}
ac += (ac >> 16) & 0xffff;
return ((uint16_t)(ac & 0xffff));
@@ -63,23 +57,13 @@ dst_region_computerid(const isc_region_t *source) {
p = source->base;
size = source->length;
if (source->base[3] == DST_ALG_RSAMD5) {
ac = (p[size - 3] << 8) + p[size - 2];
if (size == 4U) {
ac |= (DNS_KEYFLAG_REVOKE<<8);
}
return (ac);
}
ac = ((*p) << 8) + *(p + 1);
ac |= DNS_KEYFLAG_REVOKE;
for (size -= 2, p +=2; size > 1; size -= 2, p += 2) {
for (size -= 2, p +=2; size > 1; size -= 2, p += 2)
ac += ((*p) << 8) + *(p + 1);
}
if (size > 0) {
if (size > 0)
ac += ((*p) << 8);
}
ac += (ac >> 16) & 0xffff;
return ((uint16_t)(ac & 0xffff));