From 03b91da364b1b810352207659af605081fc5ae5f Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Fri, 14 Jun 2013 13:44:54 +0300 Subject: [PATCH] Reverted TSIG changes --- pdns/dnsrecords.cc | 4 ++-- pdns/qtype.hh | 2 +- pdns/test-dnsrecords_cc.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc index 14f64d1065..e862e101ce 100644 --- a/pdns/dnsrecords.cc +++ b/pdns/dnsrecords.cc @@ -434,8 +434,8 @@ void reportOtherTypes() NSEC3PARAMRecordContent::report(); TLSARecordContent::report(); DLVRecordContent::report(); - //DNSRecordContent::regist(0xff, QType::TSIG, &TSIGRecordContent::make, &TSIGRecordContent::make, "TSIG"); - TSIGRecordContent::report(); + DNSRecordContent::regist(0xff, QType::TSIG, &TSIGRecordContent::make, &TSIGRecordContent::make, "TSIG"); + //TSIGRecordContent::report(); OPTRecordContent::report(); EUI48RecordContent::report(); EUI64RecordContent::report(); diff --git a/pdns/qtype.hh b/pdns/qtype.hh index e8a18653a0..a4d34267ee 100644 --- a/pdns/qtype.hh +++ b/pdns/qtype.hh @@ -142,7 +142,7 @@ private: qtype_insert("SPF",99); qtype_insert("EUI48",108); qtype_insert("EUI64",109); - qtype_insert("TSIG", 250); +// qtype_insert("TSIG", 250); qtype_insert("IXFR",251); qtype_insert("AXFR",252); qtype_insert("ANY",255); diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc index 4795a82052..bc1c127edb 100644 --- a/pdns/test-dnsrecords_cc.cc +++ b/pdns/test-dnsrecords_cc.cc @@ -140,8 +140,8 @@ BOOST_AUTO_TEST_CASE(test_record_types) { (CASE_S(QType::SPF, "\"v=spf1 a:mail.rec.test ~all\"", "\x1bv=spf1 a:mail.rec.test ~all",false)) (CASE_S(QType::EUI48, "00-11-22-33-44-55", "\x00\x11\x22\x33\x44\x55",false)) (CASE_S(QType::EUI64, "00-11-22-33-44-55-66-77", "\x00\x11\x22\x33\x44\x55\x66\x77",false)) - (CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 0 0", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x00\x00\x00",false)) -(CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 18 16 TkbpD66/Mtgo8GUEFZIwhg==", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x12\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86",true)) + //(CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 0 0", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x00\x00\x00",false)) + //(CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 18 16 TkbpD66/Mtgo8GUEFZIwhg==", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x12\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86",true)) /* (CASE_S(QType::URL, "http://server.rec.test/", "\x17http://server.rec.test/",false)) (CASE_S(QType::MBOXFW, "you@yourcompany.com", "line format",false)) (CASE_S(QType::CURL, "http://server.rec.test/", "\x17http://server.rec.test/",false)) -- 2.47.2