Remove scripts to convert KASP to old dnssec-keymgr policy

The dnssec-keymgr has been replaces with dnssec-policy in the named, so
there's no need to carry the conversion script in the contrib/ anymore.

diff --git a/contrib/README b/contrib/README
index 0cdedc74a9c9939f2944f446dbecda842ef1ac59..f3811b9c1b0d760ae4564575e5e1d2cd1f3cb655 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -8,11 +8,6 @@ be fixed as time permits.
       named and restarts it in the event of a crash, 'zone-edit'
       which enables editing of a dynamic zone, and others.
 
-    - kasp/
-
-      Scripts for converting key and signature policies from OpenDNSSEC
-      KASP format to the policy.conf format used by dnssec-keymgr.
-
     - dlz/modules
 
       Dynamically linkable DLZ modules that can be configured into

diff --git a/contrib/kasp/README b/contrib/kasp/README
deleted file mode 100644 (file)
index fb897f1..0000000
--- a/contrib/kasp/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This directory is for tools and scripts related to the OpenDNSSEC KASP
-("key and signature policy") format. Currently it only contains
-"kasp2policy.py", a python script for converting KASP key policy
-to the "dnssec.policy" format that is used by dnssec-keymgr.
-
-This depends on PLY (python lex/yacc) and on the "isc.dnskey" module in
-bin/python/isc.
-
-Basic test:
-$ python kasp2policy.py kasp.xml > policy.out
-$ diff policy.out policy.good 

diff --git a/contrib/kasp/kasp.xml b/contrib/kasp/kasp.xml
deleted file mode 100644 (file)
index d94b084..0000000
--- a/contrib/kasp/kasp.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Sample KASP file to use for testing kasp2policy.py. -->
-<KASP>
-       <Policy name="Policy1">
-         <Description>A default policy that will
-               amaze you and your friends</Description>
-               <Signatures>
-                       <Resign>PT5M</Resign>
-                       <Refresh>PT5M</Refresh>
-                       <Validity>
-                                       <Default>PT15M</Default>
-                                       <Denial>PT15M</Denial>
-                       </Validity>
-                       <Jitter>PT2M</Jitter>
-                       <InceptionOffset>PT1M</InceptionOffset>
-               </Signatures>
-
-               <Denial>
-                       <NSEC>
-                       </NSEC>
-               </Denial>
-
-               <Keys>
-                       <!-- Parameters for both KSK and ZSK -->
-                       <TTL>PT1M</TTL>
-                       <RetireSafety>PT0S</RetireSafety>
-                       <PublishSafety>PT0S</PublishSafety>
-
-                       <!-- Parameters for KSK only -->
-                       <KSK>
-                               <Algorithm length="2048">5</Algorithm>
-                               <Lifetime>PT40M</Lifetime>
-                               <Repository>softHSM</Repository>
-                               <Standby>1</Standby>
-                       </KSK>
-
-                       <!-- Parameters for ZSK only -->
-                       <ZSK>
-                               <Algorithm length="2048">5</Algorithm>
-                               <Lifetime>PT25M</Lifetime>
-                               <Repository>softHSM</Repository>
-                               <Standby>1</Standby>
-                       </ZSK>
-               </Keys>
-
-               <Zone>
-                       <PropagationDelay>PT0S</PropagationDelay>
-                       <SOA>
-                               <TTL>PT0S</TTL>
-                               <Minimum>PT0S</Minimum>
-                               <Serial>unixtime</Serial>
-                       </SOA>
-               </Zone>
-
-               <Parent>
-                       <PropagationDelay>PT8M</PropagationDelay>
-                       <DS>
-                               <TTL>PT0S</TTL>
-                       </DS>
-                       <SOA>
-                               <TTL>PT0S</TTL>
-                               <Minimum>PT0S</Minimum>
-                       </SOA>
-               </Parent>
-       </Policy>
-       <Policy name="Policy2">
-               <Description>A default policy that will amaze you and your friends</Description>
-               <Signatures>
-                       <Resign>PT7M</Resign>
-                       <Refresh>PT7M</Refresh>
-                       <Validity>
-                                       <Default>PT15M</Default>
-                                       <Denial>PT16M</Denial>
-                       </Validity>
-                       <Jitter>PT2M</Jitter>
-                       <InceptionOffset>PT1M</InceptionOffset>
-               </Signatures>
-
-               <Denial>
-                       <NSEC3>
-                               <Resalt>P120D</Resalt>
-                               <Hash>
-                                       <Algorithm>1</Algorithm>
-                                       <Iterations>5</Iterations>
-                                       <Salt length="8"/>
-                               </Hash>
-                       </NSEC3>
-               </Denial>
-
-               <Keys>
-                       <!-- Parameters for both KSK and ZSK -->
-                       <TTL>PT15M</TTL>
-                       <RetireSafety>PT0S</RetireSafety>
-                       <PublishSafety>PT0S</PublishSafety>
-
-                       <!-- Parameters for KSK only -->
-                       <KSK>
-                               <Algorithm length="2048">7</Algorithm>
-                               <Lifetime>PT45M</Lifetime>
-                               <Repository>softHSM</Repository>
-                               <Standby>1</Standby>
-                       </KSK>
-
-                       <!-- Parameters for ZSK only -->
-                       <ZSK>
-                               <Algorithm length="2048">7</Algorithm>
-                               <Lifetime>PT25M</Lifetime>
-                               <Repository>softHSM</Repository>
-                               <Standby>1</Standby>
-                       </ZSK>
-               </Keys>
-
-               <Zone>
-                       <PropagationDelay>PT0S</PropagationDelay>
-                       <SOA>
-                               <TTL>PT0S</TTL>
-                               <Minimum>PT0S</Minimum>
-                               <Serial>unixtime</Serial>
-                       </SOA>
-               </Zone>
-
-               <Parent>
-                       <PropagationDelay>PT12M</PropagationDelay>
-                       <DS>
-                               <TTL>PT0S</TTL>
-                       </DS>
-                       <SOA>
-                               <TTL>PT0S</TTL>
-                               <Minimum>PT0S</Minimum>
-                       </SOA>
-               </Parent>
-       </Policy>
-</KASP>

diff --git a/contrib/kasp/policy.good b/contrib/kasp/policy.good
deleted file mode 100644 (file)
index 18c6360..0000000
--- a/contrib/kasp/policy.good
+++ /dev/null
@@ -1,24 +0,0 @@
-# A default policy that will
-# amaze you and your friends
-policy Policy1 {
-       algorithm RSASHA1;
-       keyttl 60;
-       key-size ksk 2048;
-       key-size zsk 2048;
-       roll-period ksk 2400;
-       roll-period zsk 1500;
-       standby ksk 1;
-       standby zsk 1;
-};
-
-# A default policy that will amaze you and your friends
-policy Policy2 {
-       algorithm NSEC3RSASHA1;
-       keyttl 900;
-       key-size ksk 2048;
-       key-size zsk 2048;
-       roll-period ksk 2700;
-       roll-period zsk 1500;
-       standby ksk 1;
-       standby zsk 1;
-};

diff --git a/util/copyrights b/util/copyrights
index 1e81d475e7b8c66d0ba42a3562ac35da7fb2bfc3..e0b70326eb9f1003620addb1c2e710e4407887c0 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -980,9 +980,6 @@
 ./contrib/dlz/modules/wildcard/README          X       2013,2018,2019,2020,2021
 ./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c  X       2013,2015,2016,2018,2019,2020,2021
 ./contrib/dlz/modules/wildcard/testing/named.conf      X       2013,2018,2019
-./contrib/kasp/README                          X       2020,2021
-./contrib/kasp/kasp.xml                                X       2020,2021
-./contrib/kasp/policy.good                     X       2020,2021
 ./contrib/scripts/catzhash.py                  X       2020,2021
 ./contrib/scripts/check-secure-delegation.pl.in        PERL    2010,2012,2014,2016,2018,2019,2020
 ./contrib/scripts/check5011.pl                 X       2013,2014,2017,2018,2019,2020,2021