From 52a8fb31c78d5b3e762af7757f75bd077e4245f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 29 May 2019 15:17:04 +0200 Subject: [PATCH] Revert "Merge branch '996-wrong-key-id-is-displayed-for-rsamd5-keys' into 'master'" This reverts commit ea131d2e6a937964b65b9ccc4cd3f18de9f6d09f, reversing changes made to e79dd268b6fb36b897a3258cdf959d87f60e55e0. --- CHANGES | 2 ++ lib/dns/key.c | 24 ++++-------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index 7a6066f87d..9accfda9c1 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/lib/dns/key.c b/lib/dns/key.c index 991394acd0..61aaa17f0c 100644 --- a/lib/dns/key.c +++ b/lib/dns/key.c @@ -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));