Convert the bin/tests/optional/sig0_test.c to use RSASHA1 instead of DSA

diff --git a/bin/tests/optional/Kchild.example.+003+04017.key b/bin/tests/optional/Kchild.example.+003+04017.key
deleted file mode 100644 (file)
index 9f5cbac..0000000
--- a/bin/tests/optional/Kchild.example.+003+04017.key
+++ /dev/null
@@ -1 +0,0 @@
-child.example. IN KEY 256 3 3 ALeiYGFXbil6PgHnkm5ZE67ygEVDvGT/gqZmLH7tGboofcPSfyhh1hpw dxZgJ26d/gynWMGVSYzaXfzsxpPoNeYn+qeevQoJOaxXXlfcy8Ik52Rm eW0J9mWlf9hsD7ShIhh1+0kRYGCOCaU25wIe3SLVkN3HgqiCBDYnBY0u nMkqRadiUnoEa3Tcvc9kJx9r9gDstR2A9A5sBhFLI/XQ0gViHHLVpQ4x hz+rTLb/xrBoAb5sQJT3xUjhhdNo9HuL6kwdLdSu//PCl1QnY9NpYPVV SKUo

diff --git a/bin/tests/optional/Kchild.example.+003+04017.private b/bin/tests/optional/Kchild.example.+003+04017.private
deleted file mode 100644 (file)
index 176ff98..0000000
--- a/bin/tests/optional/Kchild.example.+003+04017.private
+++ /dev/null
@@ -1,7 +0,0 @@
-Private-key-format: v1.2
-Algorithm: 3 (DSA)
-Prime(p): vGT/gqZmLH7tGboofcPSfyhh1hpwdxZgJ26d/gynWMGVSYzaXfzsxpPoNeYn+qeevQoJOaxXXlfcy8Ik52RmeQ==
-Subprime(q): t6JgYVduKXo+AeeSblkTrvKARUM=
-Base(g): bQn2ZaV/2GwPtKEiGHX7SRFgYI4JpTbnAh7dItWQ3ceCqIIENicFjS6cySpFp2JSegRrdNy9z2QnH2v2AOy1HQ==
-Private_value(x): J1Ctez8+w1PTR56Hze3pGoe0Wag=
-Public_value(y): gPQObAYRSyP10NIFYhxy1aUOMYc/q0y2/8awaAG+bECU98VI4YXTaPR7i+pMHS3Urv/zwpdUJ2PTaWD1VUilKA==

diff --git a/bin/tests/optional/Kchild.example.+005+33180.key b/bin/tests/optional/Kchild.example.+005+33180.key
new file mode 100644 (file)
index 0000000..ab92a6a
--- /dev/null
+++ b/bin/tests/optional/Kchild.example.+005+33180.key
@@ -0,0 +1,5 @@
+; This is a zone-signing key, keyid 33180, for child.example.
+; Created: 20181025104746 (Thu Oct 25 12:47:46 2018)
+; Publish: 20181025104746 (Thu Oct 25 12:47:46 2018)
+; Activate: 20181025104746 (Thu Oct 25 12:47:46 2018)
+child.example. IN DNSKEY 256 3 5 AwEAAb9eatC8ASzDnRApcZuxyBrvJRANRQjCXQ1FWK+8vEyXV5NIE9Km hKIV2wbq2tLBPfjNQz4BTJ9RmDINf1RayDlt6L+IQV1JCaDaMjd1zU3n SQK18Y7fMu0ww4AMKOnoVRbkIxa3zlA0chImXcfPE0q2AvKBYLzPfkPO cfplAuRkLcGUxdADCipNzCOakpcd5gfm9Sa2HlaXcw3gyI1WcE8=

diff --git a/bin/tests/optional/Kchild.example.+005+33180.private b/bin/tests/optional/Kchild.example.+005+33180.private
new file mode 100644 (file)
index 0000000..83a50df
--- /dev/null
+++ b/bin/tests/optional/Kchild.example.+005+33180.private
@@ -0,0 +1,13 @@
+Private-key-format: v1.3
+Algorithm: 5 (RSASHA1)
+Modulus: v15q0LwBLMOdEClxm7HIGu8lEA1FCMJdDUVYr7y8TJdXk0gT0qaEohXbBura0sE9+M1DPgFMn1GYMg1/VFrIOW3ov4hBXUkJoNoyN3XNTedJArXxjt8y7TDDgAwo6ehVFuQjFrfOUDRyEiZdx88TSrYC8oFgvM9+Q85x+mUC5GQtwZTF0AMKKk3MI5qSlx3mB+b1JrYeVpdzDeDIjVZwTw==
+PublicExponent: AQAB
+PrivateExponent: WDsn9GU6BXGLENCK2MX3BLQN2oDDu24hiOTYJu5VwtpkPjuVKCIuNKzu9xmBGnqOIBBDWGsw8KOmEC247yOL/S53iRdBS8lI7yiqznc52RhlmrdPKXbNpVnPwil8wocw+oQYa7uvdPYxI2Yy3B/tRgUxlxSlc/LW/dr0BX2L7qr/aeOBeGSRUlCpc7tYU9a2RUaLpVxF6SlqicCpC91MAQ==
+Prime1: 466f+JL66Bl4qYnkj0s9+1N3pYmdcM9Ja1AN66X4VLslA9Cm1JEaC5V9HOptfcXUk0XYEVnKeKM2lIQnvcLG0yuQHIa+pGi7P8vgQfdaRUE=
+Prime2: 1yuUkTVRSbUWeUreEcHgeeBBJ61UshX7t07gnGgIr3artGdo2CVEb5//+2Mvj5bgjCQBvjBbmHNZrR0jKDRBTIGtqbBerOuhEN4AXdAEgY8=
+Exponent1: KzUXbJ/P973ltR7S/hKEV66WVRbRhvf/cdsGWULs5n+BXcD59/r1W19qF9OxJZ4mYjBt+ZT1pIEsuXB+7jcJbkelGJTFlwO9DTVOgJZFTkE=
+Exponent2: FTPsLertGbBIiKdB/sn2Dsx0Xy6LXAkihsu1AnSV9oRhIyPVhwcVGVLQ7Lq3YxThB648pbsqK3miapamcj3D+YAF1uTUT4Hgm0LlEll/OC0=
+Coefficient: Vulw9kmmjKc+wmOukLdzheoA2hNPDVtgiynfzHybyXdqvapCoK+ZVmNFzjO0M41ATcpvya3iX0bekMQqYnBhLURNZUIyqz2nGskOjV8I5Jg=
+Created: 20181025104746
+Publish: 20181025104746
+Activate: 20181025104746

diff --git a/bin/tests/optional/sig0_test.c b/bin/tests/optional/sig0_test.c
index f400254f322bab666a5b523a8c652e57c26dd0dd..cf00896409c3f15b56fdb91966001dc9c67e03f0 100644 (file)
--- a/bin/tests/optional/sig0_test.c
+++ b/bin/tests/optional/sig0_test.c
@@ -255,7 +255,7 @@ main(int argc, char *argv[]) {
        CHECK("dns_name_fromtext", result);
 
        key = NULL;
-       result = dst_key_fromfile(name, 4017, DNS_KEYALG_DSA,
+       result = dst_key_fromfile(name, 33180, DNS_KEYALG_RSASHA1,
                                  DST_TYPE_PUBLIC | DST_TYPE_PRIVATE,
                                  NULL, mctx, &key);
        CHECK("dst_key_fromfile", result);

diff --git a/util/copyrights b/util/copyrights
index 2eb3915f67d0060c1a3bb0123ce41bedb800961d..6f4b833408f2085fd97680c4bee65e0c8a6b3d2d 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -302,8 +302,8 @@
 ./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/makejournal.c                      C       2013,2015,2016,2017,2018
 ./bin/tests/named.conf                         CONF-C  1999,2000,2001,2004,2007,2011,2015,2016,2018
-./bin/tests/optional/Kchild.example.+003+04017.key     X       2000,2001,2018
-./bin/tests/optional/Kchild.example.+003+04017.private X       2000,2001,2018
+./bin/tests/optional/Kchild.example.+005+33180.key     X       2018
+./bin/tests/optional/Kchild.example.+005+33180.private X       2018
 ./bin/tests/optional/adb_test.c                        C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
 ./bin/tests/optional/backtrace_test.c          C       2009,2013,2015,2016,2018
 ./bin/tests/optional/byaddr_test.c             C       2000,2001,2002,2004,2005,2007,2012,2015,2016,2018
@@ -327,7 +327,7 @@
 ./bin/tests/optional/rwlock_test.c             C       1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
 ./bin/tests/optional/serial_test.c             C       1999,2000,2001,2003,2004,2007,2015,2016,2018
 ./bin/tests/optional/shutdown_test.c           C       1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
-./bin/tests/optional/sig0_test.c               C       2000,2001,2004,2005,2007,2008,2009,2012,2015,2016,2018
+./bin/tests/optional/sig0_test.c               C       2000,2001,2004,2005,2007,2008,2009,2012,2015,2016,2018
 ./bin/tests/optional/sock_test.c               C       1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/optional/sym_test.c                        C       1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
 ./bin/tests/optional/task_test.c               C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018