fix filter-aaaa system test to work when crypto is disabled

diff --git a/bin/tests/system/filter-aaaa/ns1/signed.db.presigned b/bin/tests/system/filter-aaaa/ns1/signed.db.presigned
new file mode 100644 (file)
index 0000000..1a283ef
--- /dev/null
+++ b/bin/tests/system/filter-aaaa/ns1/signed.db.presigned
@@ -0,0 +1,110 @@
+; File written on Thu May  1 12:16:00 2014
+; dnssec_signzone version 9.8.5-P1
+signed.                        120     IN SOA  ns.utld. hostmaster.ns.utld. (
+                                       1          ; serial
+                                       3600       ; refresh (1 hour)
+                                       1200       ; retry (20 minutes)
+                                       604800     ; expire (1 week)
+                                       60         ; minimum (1 minute)
+                                       )
+                       120     RRSIG   SOA 3 1 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BEFlElqfz17JeL/ISbgEz7yenWy2QjhgdMUx
+                                       VDLBx3+Eiz1nyB1CpWw= )
+                       120     NS      ns.utld.
+                       120     RRSIG   NS 3 1 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BC4nYbfEyROe0CZPj/cHRl7BCIc0MbzpDBwz
+                                       an8bPTHrbaHpC8rdX54= )
+                       120     MX      10 mx.signed.
+                       120     RRSIG   MX 3 1 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BEp7iUXEnBCXVtKHcIRfkiK34J83ZbC3g7qQ
+                                       XY+wdpJ7TxavEBtZO94= )
+                       60      NSEC    a-only.signed. NS SOA MX RRSIG NSEC DNSKEY
+                       60      RRSIG   NSEC 3 1 60 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BAjeMFAXkfL9AypyihxU7lvhGCENKAwpoGt6
+                                       WYd6G0kb6zdpZ/AR1GQ= )
+                       120     DNSKEY  256 3 3 (
+                                       BJIozpii3vZYz7LNraaDEOOpLFcdlw091gEG
+                                       +SHpTEVDdb7atLaYCYoSaodASSYutOQbba1o
+                                       i6xLiEAZdb4MNoM50vOtQlb4NJDAGElTOShK
+                                       RE60G1veNVuN87ZpsiPlLU7m307l03aNUkJu
+                                       LNd19kEuq1ItZt1SFVUkLvAHxs8hSLyDpq/u
+                                       4P/6QnPG294dk2eh83m2PuQVChvJLcrFhIbJ
+                                       CWxCEsW9fe2eO1YtwoyFmqIIFSlAs84bwy2O
+                                       iA7x0PeoXpKGLhuKCbvre5zVLRaqMFoMDJmr
+                                       vpGTxJ+AbOLEzDgO8QkGT+WCEBSMqRXvUkX0
+                                       rBcSDAa8GpCTyhVs0j9KIedRbYalV24JzViy
+                                       m7UrKcZojCcXEjl0rXIJHNlfvQsfy6F3cq4m
+                                       GimMrtxmA5Wf1xoJ
+                                       ) ; key id = 12955
+                       120     DNSKEY  257 3 3 (
+                                       BJIozpii3vZYz7LNraaDEOOpLFcdlw091gEG
+                                       +SHpTEVDdb7atLaYCYoSaodASSYutOQbba1o
+                                       i6xLiEAZdb4MNoM50vOtQlb4NJDAGElTOShK
+                                       RE60G1veNVuN87ZpsiPlLU7m307l03aNUkJu
+                                       LNd19kEuq1ItZt1SFVUkLvAHxs8hSLyDpq/u
+                                       4P/6QnPG294dk2eh83m2PuQVChvJLcrFhIbJ
+                                       CWxCEsW9fe2eO1YtwoyFmqIIFSlAs84bwy2O
+                                       iA7x0PeoXpKGLhuKCbvre5zVLRaqMFoMDJmr
+                                       vpGTxJ+AbOLEzDgO8QkGT+WCEBSMqRXvUkX0
+                                       rBcSDAa8GpCTyhVs0j9KIedRbYalV24JzViy
+                                       m7UrKcZojCcXEjl0rXIJHNlfvQsfy6F3cq4m
+                                       GimMrtxmA5Wf1xoJ
+                                       ) ; key id = 12956
+                       120     RRSIG   DNSKEY 3 1 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BG/sW/I/ZVcUCjGfAicxv4kYLLYoMZlivDqU
+                                       V3GfAXR5Bp69ywKp1OA= )
+                       120     RRSIG   DNSKEY 3 1 120 20820519023008 (
+                                       20140501011600 12956 signed.
+                                       BAoQwXiKVoWwY+IDfzRndz9ndLPTSShDHpxS
+                                       Z9+uTx+KCPzUsZYQy4k= )
+a-only.signed.         120     IN NS   1.0.0.1.signed.
+                       60      NSEC    aaaa-only.signed. NS RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BBRjTWMwkjpanDw386nblW6fwyliYRUeNNo+
+                                       OHwhqHXXd4bathApttg= )
+aaaa-only.signed.      120     IN AAAA 2001:db8::2
+                       120     RRSIG   AAAA 3 2 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BDukZxGM62Wmk9JE7F5etkcX4LZyFLK0YS0H
+                                       CF0lovOlBeK5zLgi/MA= )
+                       60      NSEC    dual.signed. AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BH1TJpK7j1Gu01hb2PimefFISv59NDLfZ9Gr
+                                       ojpnjDQNV6bA7HcHeEM= )
+dual.signed.           120     IN A    1.0.0.3
+                       120     RRSIG   A 3 2 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BBIDPDxbSm3X/Xf5xh/MYIkAvZ9CWpEzSwbM
+                                       Pks77CGb4rW8IF8WXxs= )
+                       120     AAAA    2001:db8::3
+                       120     RRSIG   AAAA 3 2 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BHKD6egOF6e2DfY7+iPNDPcMS6TdU8/OCm8u
+                                       OYjmr11t5cI8S0R1Iqk= )
+                       60      NSEC    mx.signed. A AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BHeXsjvM4Bmr/Ih4eDgR9VTC7R/UFlz5ns+g
+                                       7LPl+H9Oe6zGnM5rGOs= )
+mx.signed.             120     IN A    1.0.0.3
+                       120     RRSIG   A 3 2 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BAq3t2X4XDI/dIofEkALZsNn1ezNWDYFH0M2
+                                       2GI5F0JHr/iZPlAzRbk= )
+                       120     AAAA    2001:db8::3
+                       120     RRSIG   AAAA 3 2 120 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BFts4Mon2FQaLQb6kPOKTEFkHaPIE1xUgrI6
+                                       qV8tEaAyFXfhH4su6Y0= )
+                       60      NSEC    signed. A AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519023008 (
+                                       20140501011600 12955 signed.
+                                       BCQWnlB8hrID+v5xG/o8t8E+YDb3Fz7Qodmw
+                                       kBQ+ZwyIeLOoH2+as5A= )

diff --git a/bin/tests/system/filter-aaaa/ns4/signed.db.presigned b/bin/tests/system/filter-aaaa/ns4/signed.db.presigned
new file mode 100644 (file)
index 0000000..d96c104
--- /dev/null
+++ b/bin/tests/system/filter-aaaa/ns4/signed.db.presigned
@@ -0,0 +1,110 @@
+; File written on Thu May  1 12:22:01 2014
+; dnssec_signzone version 9.8.5-P1
+signed.                        120     IN SOA  ns.utld. hostmaster.ns.utld. (
+                                       1          ; serial
+                                       3600       ; refresh (1 hour)
+                                       1200       ; retry (20 minutes)
+                                       604800     ; expire (1 week)
+                                       60         ; minimum (1 minute)
+                                       )
+                       120     RRSIG   SOA 3 1 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BMC1gbQgLgNsb9G6rElwoY6Krb6lV/WFsd/j
+                                       LO3aVnPXgU/noM1IBjs= )
+                       120     NS      ns.utld.
+                       120     RRSIG   NS 3 1 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BF9dWcW8GHL4QMp7rbeQgfUQmwEvskiMFqgt
+                                       GJqepDLkV4WXtw3TRK4= )
+                       120     MX      10 mx.signed.
+                       120     RRSIG   MX 3 1 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BJ7bngL8eZ9GrjQvHj0FDOgk2M6+YoW+cIAh
+                                       ZjGKcK431aUFMS3YSGE= )
+                       60      NSEC    a-only.signed. NS SOA MX RRSIG NSEC DNSKEY
+                       60      RRSIG   NSEC 3 1 60 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BHMei3tCaM9eYTPLRn93c6qp9ADL1Hxy+HlN
+                                       cLTyzzC+UxjUoI9O2VI= )
+                       120     DNSKEY  256 3 3 (
+                                       BPLuLs4Ylbx3WZ8Ebj6GF+uEfI+J+RcaI1G3
+                                       TW4JHqVqeBa0gkPjnCDsK9VeUx5CR8i/T18f
+                                       YrOSojvASvdvG+TLNN9Jx+5A7c/43WzDOe2B
+                                       jeAlfZSl1Bie/ccGL6W1+lVvlO0OHI54EoKs
+                                       KxRub2izdouH4867a8dwahBlm14oWYXjqk3+
+                                       /ubDCPdXdTUvvLnDd9zyDpWYBXisb/3F8R1v
+                                       IcqyKDfJSTQSofLK+JlD+n7cv7U7pQWQn2qA
+                                       t/NkGcwF8EAbiQPmcF1BY6NnEMQ5XxNayAF5
+                                       Eza+i/kf3hLtS12cqW8hWm7aRYZWbzC4uUZL
+                                       WGK0XfAK2d/vT8ZMZo1oaYEvy3xHwfsFgrFV
+                                       qebm2ZFEomHpQ4KOSL1UhVI8uegUgnnovHjC
+                                       eS4q72Fh+LZTD8C4
+                                       ) ; key id = 20366
+                       120     DNSKEY  257 3 3 (
+                                       BPLuLs4Ylbx3WZ8Ebj6GF+uEfI+J+RcaI1G3
+                                       TW4JHqVqeBa0gkPjnCDsK9VeUx5CR8i/T18f
+                                       YrOSojvASvdvG+TLNN9Jx+5A7c/43WzDOe2B
+                                       jeAlfZSl1Bie/ccGL6W1+lVvlO0OHI54EoKs
+                                       KxRub2izdouH4867a8dwahBlm14oWYXjqk3+
+                                       /ubDCPdXdTUvvLnDd9zyDpWYBXisb/3F8R1v
+                                       IcqyKDfJSTQSofLK+JlD+n7cv7U7pQWQn2qA
+                                       t/NkGcwF8EAbiQPmcF1BY6NnEMQ5XxNayAF5
+                                       Eza+i/kf3hLtS12cqW8hWm7aRYZWbzC4uUZL
+                                       WGK0XfAK2d/vT8ZMZo1oaYEvy3xHwfsFgrFV
+                                       qebm2ZFEomHpQ4KOSL1UhVI8uegUgnnovHjC
+                                       eS4q72Fh+LZTD8C4
+                                       ) ; key id = 20367
+                       120     RRSIG   DNSKEY 3 1 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BBhlUYWd3f00zsSl+UJTxeVZUimQP8iMjf6j
+                                       Q7uPoI37BUz9NbZhTCg= )
+                       120     RRSIG   DNSKEY 3 1 120 20820519033608 (
+                                       20140501012201 20367 signed.
+                                       BHPcogpnebYByfzp/KT53GsIiT3yPk/4atwj
+                                       NNsPFmVLqb/6yjotWQ0= )
+a-only.signed.         120     IN NS   1.0.0.1.signed.
+                       60      NSEC    aaaa-only.signed. NS RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BF1Wt+NtJ1Cuoj1H1D9BCS33ImdgkZeyEKuz
+                                       8FT66wAFigkXQ1zNofw= )
+aaaa-only.signed.      120     IN AAAA 2001:db8::2
+                       120     RRSIG   AAAA 3 2 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BJFHllFzB91E/NWN1KjgmLuXQgDsGqBOuMuk
+                                       eNEc0RmToi3wV+TZwt0= )
+                       60      NSEC    dual.signed. AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BGfjvmN9LAHU2r9hXKgZRwyL4mZt4N/uBR1y
+                                       TKOGBOyx6b0hVHmGPnw= )
+dual.signed.           120     IN A    1.0.0.3
+                       120     RRSIG   A 3 2 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BEHMwkdjcbK++gvR/a36hSHf+uLwNUpbwKiw
+                                       PpmEz0be+gavwU0qSmY= )
+                       120     AAAA    2001:db8::3
+                       120     RRSIG   AAAA 3 2 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BPKR07CI/4KFd5L7aLMvQifiYDb1EbAP2BIp
+                                       SgErW40i5qkFz9u588s= )
+                       60      NSEC    mx.signed. A AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BGJ0Ei6QbWJva3NwVSE/Bojcodsbu0sSVVLJ
+                                       QE8F5puTbx6qZ2dqrv4= )
+mx.signed.             120     IN A    1.0.0.3
+                       120     RRSIG   A 3 2 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BOyL/Pi5Ih/Xt3b1icWIqoagM7ZKXzPKrmbQ
+                                       VOZIvn0nmCj/gjShka4= )
+                       120     AAAA    2001:db8::3
+                       120     RRSIG   AAAA 3 2 120 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BL1n80SXkdcDRaFa66xHIrMMFiYUnrM0zoGj
+                                       ArI7APPAxthUKN+ptAQ= )
+                       60      NSEC    signed. A AAAA RRSIG NSEC
+                       60      RRSIG   NSEC 3 2 60 20820519033608 (
+                                       20140501012201 20366 signed.
+                                       BG6+zIJRFY4HqyUzPLcErSJibgtxxqfuHGYP
+                                       kXX9V0coQ3zBC92s2jo= )

diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index f86f4dc6b65ef57a85aa0bee088107fbd3313ff0..5fdbbe670b60e496e6042398125f80e76828dc54 100644 (file)
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -26,5 +26,12 @@ cp ns2/named1.conf ns2/named.conf
 cp ns3/named1.conf ns3/named.conf
 cp ns4/named1.conf ns4/named.conf
 
-(cd ns1 && sh -e sign.sh)
-(cd ns4 && sh -e sign.sh)
+if sh ../testcrypto.sh -q
+then
+       (cd ns1 && sh -e sign.sh)
+       (cd ns4 && sh -e sign.sh)
+else
+       echo "I:using pre-signed zones"
+       cp -f ns1/signed.db.presigned ns1/signed.db.signed
+       cp -f ns4/signed.db.presigned ns4/signed.db.signed
+fi

diff --git a/util/copyrights b/util/copyrights
index 7e7afc19bb0c5c98b0672566c90a92f28bf33264..1ce385af6ba259698921a97a63659ac95806cb97 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1232,6 +1232,7 @@
 ./bin/tests/system/filter-aaaa/ns1/root.db     ZONE    2010,2012
 ./bin/tests/system/filter-aaaa/ns1/sign.sh     SH      2010,2012,2014
 ./bin/tests/system/filter-aaaa/ns1/signed.db.in        ZONE    2010,2012
+./bin/tests/system/filter-aaaa/ns1/signed.db.presigned X       2014
 ./bin/tests/system/filter-aaaa/ns1/unsigned.db ZONE    2010,2012
 ./bin/tests/system/filter-aaaa/ns2/hints       ZONE    2010
 ./bin/tests/system/filter-aaaa/ns2/named1.conf CONF-C  2012,2013
@@ -1244,6 +1245,7 @@
 ./bin/tests/system/filter-aaaa/ns4/root.db     ZONE    2010,2012
 ./bin/tests/system/filter-aaaa/ns4/sign.sh     SH      2010,2012,2014
 ./bin/tests/system/filter-aaaa/ns4/signed.db.in        ZONE    2010,2012
+./bin/tests/system/filter-aaaa/ns4/signed.db.presigned X       2014
 ./bin/tests/system/filter-aaaa/ns4/unsigned.db ZONE    2010,2012
 ./bin/tests/system/filter-aaaa/prereq.sh       SH      2010,2012,2014
 ./bin/tests/system/filter-aaaa/setup.sh                SH      2010,2012,2014