[(no branch, rebasing 1880-implement-the-tkey-rr)] [(no branch, rebasing 1880-impleme...

diff --git a/src/lib/dns/tests/rdata_tkey_unittest.cc b/src/lib/dns/tests/rdata_tkey_unittest.cc
index 58006f196e6102712057a7c46616bcb18c0ebd41..8592a27a0111ff7072d61fbef3a186d68ca4fb2a 100644 (file)
--- a/src/lib/dns/tests/rdata_tkey_unittest.cc
+++ b/src/lib/dns/tests/rdata_tkey_unittest.cc
@@ -276,7 +276,7 @@ TEST_F(Rdata_TKEY_Test, badFromWire) {
     EXPECT_THROW(rdataFactoryFromFile(RRType::TKEY(), RRClass::ANY(),
                                       "rdata_tkey_fromWire7.wire"),
                  DNSMessageFORMERR);
-    // Key size is bogus:
+    // Key length is bogus:
     EXPECT_THROW(rdataFactoryFromFile(RRType::TKEY(), RRClass::ANY(),
                                       "rdata_tkey_fromWire8.wire"),
                  InvalidBufferPosition);
@@ -306,13 +306,13 @@ TEST_F(Rdata_TKEY_Test, createFromParams) {
     const uint8_t fake_data[] = { 0x14, 0x02, 0x84, 0x14, 0x02, 0x84,
                                   0x14, 0x02, 0x84, 0x14, 0x02, 0x84 };
     EXPECT_EQ(0, generic::TKEY(valid_text2).compare(
-                  generic::TKEY(Name("GSS_TSIG"), 1619870400, 1619874000,
-                                3, 0, 12, fake_data, 0, 0)));
+                  generic::TKEY(Name("GSS-TSIG"), 1619870400, 1619874000,
+                                3, 16, 12, fake_data, 0, 0)));
 
     const uint8_t fake_data2[] = { 0x14, 0x02, 0x84, 0x14, 0x02, 0x84 };
     EXPECT_EQ(0, generic::TKEY(valid_text3).compare(
                   generic::TKEY(Name("gss.tsig"), 1619870400, 1619874000,
-                                3, 0, 12, fake_data, 6, fake_data2)));
+                                3, 16, 12, fake_data, 6, fake_data2)));
 
     EXPECT_THROW(generic::TKEY(Name("gss-tsig"), 0, 0, 0, 0, 0, fake_data, 0, 0),
                  isc::InvalidParameter);
@@ -383,7 +383,7 @@ TEST_F(Rdata_TKEY_Test, toWireRenderer) {
     expect_data.clear();
     renderer.clear();
     renderer.writeName(Name("gss-tsig"));
-    renderer.writeUint16(42); // RDLEN
+    renderer.writeUint16(26); // RDLEN
     rdata_tkey.toWire(renderer);
     UnitTestUtil::readWireData("rdata_tkey_toWire4.wire", expect_data);
     matchWireData(&expect_data[0], expect_data.size(),
@@ -392,7 +392,7 @@ TEST_F(Rdata_TKEY_Test, toWireRenderer) {
     // check algorithm can be used as a compression target.
     expect_data.clear();
     renderer.clear();
-    renderer.writeUint16(42);
+    renderer.writeUint16(26);
     rdata_tkey.toWire(renderer);
     renderer.writeName(Name("gss-tsig"));
     UnitTestUtil::readWireData("rdata_tkey_toWire5.wire", expect_data);
@@ -412,20 +412,30 @@ TEST_F(Rdata_TKEY_Test, compare) {
     // "AAAA" encoded in BASE64 corresponds to 0x000000, so it should be the
     // smallest data of the same length.
     vector<generic::TKEY> compare_set;
-    ///////////// TODO
-    compare_set.push_back(generic::TKEY("a.example 0 300 0 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 0 300 0 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 300 0 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 0 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 AAAA 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 FAKE 16020 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 FAKE 16021 0 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 FAKE 16021 1 0"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 FAKE 16021 1 3 AAAA"));
-    compare_set.push_back(generic::TKEY("example 1 600 3 FAKE 16021 1 3 FAKE"));
-
-    EXPECT_EQ(0, compare_set[0].compare(
-                  generic::TKEY("A.EXAMPLE 0 300 0 16020 0 0")));
+    compare_set.push_back(generic::TKEY("a.example 20210501120000 "
+                                        "20210501130000 3 0 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120000 "
+                                        "20210501130000 3 0 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130000 3 0 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 3 0 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 0 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 1 0 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 1 3 AAAA 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 1 3 FAKE 0"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 1 3 FAKE 3 AAAA"));
+    compare_set.push_back(generic::TKEY("example 20210501120001 "
+                                        "20210501130001 4 1 3 FAKE 3 FAKE"));
+
+    EXPECT_EQ(0,
+              compare_set[0].compare(generic::TKEY("A.EXAMPLE 20210501120000 "
+                                                   "20210501130000 3 0 0 0")));
 
     vector<generic::TKEY>::const_iterator it;
     vector<generic::TKEY>::const_iterator it_end = compare_set.end();

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_fromWire5.spec b/src/lib/dns/tests/testdata/rdata_tkey_fromWire5.spec
index da90b1878981b873432fa38fe3677d6ac3a7812c..6cfa4b41a95b08618238fd31f8d11565279e2ab6 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_fromWire5.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_fromWire5.spec
@@ -1,7 +1,7 @@
 #
-# TSIG-like RDATA but RDLEN is too short.
+# TKEY-like RDATA but RDLEN is too short.
 #
 [custom]
-sections: tsig
-[tsig]
-rdlen: 60
+sections: tkey
+[tkey]
+rdlen: 57

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_fromWire6.spec b/src/lib/dns/tests/testdata/rdata_tkey_fromWire6.spec
index 9d2f627442a17893acc5aaa8ed0edd4345292ec0..87460a278ef8ec4e082f053b5b8abcd62702fe78 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_fromWire6.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_fromWire6.spec
@@ -1,7 +1,7 @@
 #
-# TSIG-like RDATA but RDLEN is too long.
+# TKEY-like RDATA but RDLEN is too long.
 #
 [custom]
-sections: tsig
-[tsig]
-rdlen: 63
+sections: tkey
+[tkey]
+rdlen: 60

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_fromWire7.spec b/src/lib/dns/tests/testdata/rdata_tkey_fromWire7.spec
index ed7a81c88257e9700c440af726be50106ca05c73..3fc0929253e6ac5d9334cd967c05ea362a7b7fde 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_fromWire7.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_fromWire7.spec
@@ -1,8 +1,8 @@
 #
-# TSIG-like RDATA but algorithm name is broken.
+# TKEY-like RDATA but algorithm name is broken.
 #
 [custom]
-sections: tsig
-[tsig]
+sections: tkey
+[tkey]
 algorithm: "01234567890123456789012345678901234567890123456789012345678901234"
-mac_size: 32
+key_len: 32

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_fromWire8.spec b/src/lib/dns/tests/testdata/rdata_tkey_fromWire8.spec
index 0b44f879c4eaee962bf5850001b6f916c7d8e28a..8338279d724d1cb498ad37ce8e4742714c397b41 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_fromWire8.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_fromWire8.spec
@@ -1,8 +1,8 @@
 #
-# TSIG-like RDATA but MAC size is bogus
+# TKEY-like RDATA but Key len is bogus
 #
 [custom]
-sections: tsig
-[tsig]
-mac_size: 65535
-mac: "dummy data"
+sections: tkey
+[tkey]
+key_len: 65535
+key: "dummy data"

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_fromWire9.spec b/src/lib/dns/tests/testdata/rdata_tkey_fromWire9.spec
index f512fb438987ec1bce3afe536b4a4127fb74eac3..9fb63e0ec8481c081030476aa8791e59c030635f 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_fromWire9.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_fromWire9.spec
@@ -1,8 +1,8 @@
 #
-# TSIG-like RDATA but Other-Data length is bogus
+# TKEY-like RDATA but Other-Data length is bogus
 #
 [custom]
-sections: tsig
-[tsig]
+sections: tkey
+[tkey]
 other_len: 65535
 otherdata: "dummy data"

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_toWire1.spec b/src/lib/dns/tests/testdata/rdata_tkey_toWire1.spec
index eb740009b76be2f0d71dabd8ffffa8a7b38da041..42521a3c754cacb16c49e014391d37153ae383f2 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_toWire1.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_toWire1.spec
@@ -1,11 +1,8 @@
 #
-# An artificial TSIG RDATA for toWire test.
+# An artificial TKEY RDATA for toWire test.
 #
 [custom]
-sections: tsig
-[tsig]
-algorithm: hmac-md5
-time_signed: 1286779327
-mac_size: 0
-original_id: 16020
-error: 17
+sections: tkey
+[tkey]
+algorithm: gss-tsig
+key_len: 0

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_toWire2.spec b/src/lib/dns/tests/testdata/rdata_tkey_toWire2.spec
index b2c38e95316743897e2da4f401b7a462d17a8f61..25d47e5d47a96b9f79e1b3610d57e65c698a3566 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_toWire2.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_toWire2.spec
@@ -1,13 +1,11 @@
 #
-# An artificial TSIG RDATA for toWire test.
+# An artificial TKEY RDATA for toWire test.
 #
 [custom]
-sections: tsig
-[tsig]
-algorithm: hmac-sha256
-time_signed: 1286779327
-mac_size: 12
-# 0x1402... would be FAKEFAKE... if encoded in BASE64
-mac: 0x140284140284140284140284
-original_id: 16020
+sections: tkey
+[tkey]
+algorithm: GSS-TSIG
 error: 16
+key_len: 12
+# 0x1402... would be FAKEFAKE... if encoded in BASE64
+key: 0x140284140284140284140284

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_toWire3.spec b/src/lib/dns/tests/testdata/rdata_tkey_toWire3.spec
index 6520a08e4e38936d2ca3e90e75157dd8623146b9..b3ea3dbd2a7343f6f1e1aef69e1bd8a146346c5b 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_toWire3.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_toWire3.spec
@@ -1,15 +1,13 @@
 #
-# An artificial TSIG RDATA for toWire test.
+# An artificial TKEY RDATA for toWire test.
 #
 [custom]
-sections: tsig
-[tsig]
-algorithm: hmac-sha1
-time_signed: 1286779327
-mac_size: 12
+sections: tkey
+[tkey]
+algorithm: gss.tsig
+error: 16
+key_len: 12
 # 0x1402... would be FAKEFAKE... if encoded in BASE64
-mac: 0x140284140284140284140284
-original_id: 16020
-error: 18
+key: 0x140284140284140284140284
 other_len: 6
 other_data: 0x140284140284

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_toWire4.spec b/src/lib/dns/tests/testdata/rdata_tkey_toWire4.spec
index d95cd238278fd89a899f95a0529d084bc48ca833..e403c00429ecf9b2be18bbdcc04d89ee9dcd4ac3 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_toWire4.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_toWire4.spec
@@ -1,13 +1,10 @@
 #
-# An artificial TSIG RDATA for toWire test.
+# An artificial TKEY RDATA for toWire test.
 #
 [custom]
-sections: name:tsig
+sections: name:tkey
 [name]
-name: hmac-md5.sig-alg.reg.int.
-[tsig]
-algorithm: hmac-md5
-time_signed: 1286779327
-mac_size: 0
-original_id: 16020
-error: 17
+name: gss-tsig
+[tkey]
+algorithm: gss-tsig
+key_len: 0

diff --git a/src/lib/dns/tests/testdata/rdata_tkey_toWire5.spec b/src/lib/dns/tests/testdata/rdata_tkey_toWire5.spec
index 81e3a78901fc060086918d0e5af494384c61231e..b4a1bcacc9129374c22fc3e83363728829b8bf92 100644 (file)
--- a/src/lib/dns/tests/testdata/rdata_tkey_toWire5.spec
+++ b/src/lib/dns/tests/testdata/rdata_tkey_toWire5.spec
@@ -1,13 +1,10 @@
 #
-# An artificial TSIG RDATA for toWire test.
+# An artificial TKEY RDATA for toWire test.
 #
 [custom]
-sections: tsig:name
-[tsig]
-algorithm: hmac-md5
-time_signed: 1286779327
-mac_size: 0
-original_id: 16020
-error: 17
+sections: tkey:name
+[tkey]
+algorithm: gss-tsig
+key_len: 0
 [name]
 name: ptr=2