From 29bf169687f83856fc6551e6d8a33c398fab40c0 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Wed, 4 Dec 2013 00:34:39 +0100 Subject: [PATCH] fix hmac-md5 TSIG key lookup Conflicts: pdns/dnspacket.cc --- pdns/dnspacket.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index 327ff15ddf..96bfde51a9 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -597,11 +597,14 @@ bool checkForCorrectTSIG(const DNSPacket* q, DNSBackend* B, string* keyname, str L<qdomain<<"' denied: TSIG (key '"<<*keyname<<"') time delta "<< abs(trc->d_time - now)<<" > 'fudge' "<d_fudge<d_algoName; + if (stripDot(algoName) == "hmac-md5.sig-alg.reg.int") + algoName = "hmac-md5"; + string secret64; - - if(!B->getTSIGKey(*keyname, &trc->d_algoName, &secret64)) { - L<qdomain<<"' denied: can't find TSIG key with name '"<<*keyname<<"' and algorithm '"<d_algoName<<"'"<getTSIGKey(*keyname, &algoName, &secret64)) { + L<qdomain<<"' denied: can't find TSIG key with name '"<<*keyname<<"' and algorithm '"<