[master] copyrights

diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
index c731a5d953a2dbfba1427efae2f705419d7df99e..534fd72b96ee20271661cfea17e70b8e1e768a5d 100644 (file)
--- a/bin/python/Makefile.in
+++ b/bin/python/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index 79db6f1aa161020e26b3743e495269ce880ffd47..16774fb5012ce95165c6f38fa30d5657c8aaaa97 100644 (file)
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/dnssec-coverage.docbook b/bin/python/dnssec-coverage.docbook
index 892801ecd08a4a7678c384185147667da384341d..29369227fdb80f8ad0a64e383ee9506c0f6da087 100644 (file)
--- a/bin/python/dnssec-coverage.docbook
+++ b/bin/python/dnssec-coverage.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +40,7 @@
       <year>2013</year>
       <year>2014</year>
       <year>2015</year>
+      <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
index 8a8e25012fb74059c6866b8e533f7b5b5a0a93f4..af33331a222970400ed5cb634117fa77951b34ea 100644 (file)
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/dnssec-keymgr.py.in b/bin/python/dnssec-keymgr.py.in
index 23d563d71fe18df88f8dc8d0a72ad9c70b657ffc..c300c018b68768ef831b794a9844750ed31c4a25 100644 (file)
--- a/bin/python/dnssec-keymgr.py.in
+++ b/bin/python/dnssec-keymgr.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/Makefile.in b/bin/python/isc/Makefile.in
index 425d054cceb601e46555d4a9a685263a5d4f9319..802ef678519486e3cc9c32761b4b6bf7dc3bb4ed 100644 (file)
--- a/bin/python/isc/Makefile.in
+++ b/bin/python/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/__init__.py b/bin/python/isc/__init__.py
index 0d79f356fd59e15dbabd7ae24572eb2ff5fbcae1..f0770859ecb21c3e7417922898e46b01f2aa8940 100644 (file)
--- a/bin/python/isc/__init__.py
+++ b/bin/python/isc/__init__.py
@@ -1,17 +1,18 @@
-# Copyright (C) 2015  Internet Systems Consortium.
+############################################################################
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
 
 __all__ = ['dnskey', 'eventlist', 'keydict', 'keyevent', 'keyseries',
            'keyzone', 'policy', 'parsetab', 'utils']

diff --git a/bin/python/isc/checkds.py b/bin/python/isc/checkds.py
index 64ca12ebc6e0c5cb788a888d36477a253726d33b..6be5e444b8028b4cb6b5754b02dfbc23254aaa9b 100644 (file)
--- a/bin/python/isc/checkds.py
+++ b/bin/python/isc/checkds.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/coverage.py b/bin/python/isc/coverage.py
index c9e89596f771a07e799bf101647c769242db1114..01ceef2730faeeb47ce114955ddb05ddedfde35d 100644 (file)
--- a/bin/python/isc/coverage.py
+++ b/bin/python/isc/coverage.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/dnskey.py b/bin/python/isc/dnskey.py
index f1559e72390589fa21f75d1b68e43799cd83e9c8..10c14b96640efdda52f83247ceaab88aa55c9791 100644 (file)
--- a/bin/python/isc/dnskey.py
+++ b/bin/python/isc/dnskey.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/eventlist.py b/bin/python/isc/eventlist.py
index 4c91368f12e6eb19898985c838ddd95a0e296091..c64aa23edc364f8fc29f62bcb5915421abb30d8e 100644 (file)
--- a/bin/python/isc/eventlist.py
+++ b/bin/python/isc/eventlist.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/keydict.py b/bin/python/isc/keydict.py
index cc73dc47ac662b5bbfb8e1e8ad41ef7d0db3793e..078689ba46da87e0f2dd75d1a721de865df0306c 100644 (file)
--- a/bin/python/isc/keydict.py
+++ b/bin/python/isc/keydict.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/keyevent.py b/bin/python/isc/keyevent.py
index 9025feec4a3e05d73c4b0442d857890b56669218..6e9a29d4901f08617a7693fd6a7eada8b308d75d 100644 (file)
--- a/bin/python/isc/keyevent.py
+++ b/bin/python/isc/keyevent.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/keymgr.py b/bin/python/isc/keymgr.py
index a3a9043965a9225bb561079d3b5a1cd18bf43053..8aa6cceff8e72c9533ae491ab2f61133d6d23b80 100644 (file)
--- a/bin/python/isc/keymgr.py
+++ b/bin/python/isc/keymgr.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/keyseries.py b/bin/python/isc/keyseries.py
index ed09f71fda3aede61142a6953756d4ededa83141..3120d0226d7e46623560b9703725f9f8a12f8792 100644 (file)
--- a/bin/python/isc/keyseries.py
+++ b/bin/python/isc/keyseries.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/keyzone.py b/bin/python/isc/keyzone.py
index 7dfb31ac558a544cc0b2f09f62250968f583d6fd..dc0c7ea0519a9473a64603d6fb3174e8d44f5464 100644 (file)
--- a/bin/python/isc/keyzone.py
+++ b/bin/python/isc/keyzone.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/policy.py b/bin/python/isc/policy.py
index ed106c6c92a7d8b4e0616bd20c27dd2e4ba9e359..3a04d6ab97b3dd1e2547b8eb1ccae32191e26096 100644 (file)
--- a/bin/python/isc/policy.py
+++ b/bin/python/isc/policy.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -13,9 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 ############################################################################
-# policy.py
-# This module implements the parser for the dnssec.policy file.
-############################################################################
 
 import re
 import ply.lex as lex

diff --git a/bin/python/isc/tests/Makefile.in b/bin/python/isc/tests/Makefile.in
index 506f2cc992e6d17dccee7fa4c001fa164a158f0f..baca4ff25b521ec296222c1df5ed541f8cbfcc92 100644 (file)
--- a/bin/python/isc/tests/Makefile.in
+++ b/bin/python/isc/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/tests/dnskey_test.py b/bin/python/isc/tests/dnskey_test.py
index 2a63695ebe23699d9b14296e2017c33953dcb795..11e16515f14f10422a5a240bc145af1121f21f18 100644 (file)
--- a/bin/python/isc/tests/dnskey_test.py
+++ b/bin/python/isc/tests/dnskey_test.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/tests/policy_test.py b/bin/python/isc/tests/policy_test.py
index c35e023ad3bb5a1c7ffca792155d70be9bd1f9f2..61daa91056a73ca69ff8bd53ac1eeb2937e4e895 100644 (file)
--- a/bin/python/isc/tests/policy_test.py
+++ b/bin/python/isc/tests/policy_test.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/python/isc/tests/test-policies/01-keysize.pol b/bin/python/isc/tests/test-policies/01-keysize.pol
index b54f1e33ae4ba254617f3c390cc92fc046eae13a..ad1d82b2adb8b39feff2f2030c1d7ac572871c25 100644 (file)
--- a/bin/python/isc/tests/test-policies/01-keysize.pol
+++ b/bin/python/isc/tests/test-policies/01-keysize.pol
@@ -1,41 +1,57 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy keysize_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+       algorithm rsasha1;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 2w;
+       post-publish zsk 2w;
+       roll-period ksk 1y;
+       pre-publish ksk 1mo;
+       post-publish ksk 2mo;
+       keyttl 1h;
+       key-size ksk 2048;
+       key-size zsk 1024;
 };
 
 policy keysize_dsa {
-        algorithm dsa;
-        coverage 1y;
-        key-size ksk 2048;
-        key-size zsk 1024;
+       algorithm dsa;
+       coverage 1y;
+       key-size ksk 2048;
+       key-size zsk 1024;
 };
 
 zone good_rsa.test {
-        policy keysize_rsa;
+       policy keysize_rsa;
 };
 
 zone bad_rsa.test {
-        policy keysize_rsa;
-        key-size ksk 511;
+       policy keysize_rsa;
+       key-size ksk 511;
 };
 
 zone good_dsa.test {
-        policy keysize_dsa;
-        key-size ksk 1024;
-        key-size zsk 768;
+       policy keysize_dsa;
+       key-size ksk 1024;
+       key-size zsk 768;
 };
 
 zone bad_dsa.test {
-        policy keysize_dsa;
-        key-size ksk 1024;
-        key-size zsk 769;
+       policy keysize_dsa;
+       key-size ksk 1024;
+       key-size zsk 769;
 };

diff --git a/bin/python/isc/tests/test-policies/02-prepublish.pol b/bin/python/isc/tests/test-policies/02-prepublish.pol
index e4d11c2e54e248df9f29b8ce8a4d87d26320ef7e..5fdc566845b512261b547aa9231fe5ce7530d106 100644 (file)
--- a/bin/python/isc/tests/test-policies/02-prepublish.pol
+++ b/bin/python/isc/tests/test-policies/02-prepublish.pol
@@ -1,31 +1,47 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy prepublish_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+       algorithm rsasha1;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 2w;
+       post-publish zsk 2w;
+       roll-period ksk 1y;
+       pre-publish ksk 1mo;
+       post-publish ksk 2mo;
+       keyttl 1h;
+       key-size ksk 2048;
+       key-size zsk 1024;
 };
 
 // Policy that defines a pre-publish period lower than the rollover period
 zone good_prepublish.test {
-        policy prepublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
+       policy prepublish_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 1mo;
 };
 
 // Policy that defines a pre-publish period equal to the rollover period
 zone bad_prepublish.test {
-        policy prepublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 4mo;
+       policy prepublish_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 4mo;
 };
 
 

diff --git a/bin/python/isc/tests/test-policies/03-postpublish.pol b/bin/python/isc/tests/test-policies/03-postpublish.pol
index a4c3a99e9999756191ccad9b9950ab7e34d82d12..d95ce30906dc49fd6b74bd7a0285b8e9c6c9f895 100644 (file)
--- a/bin/python/isc/tests/test-policies/03-postpublish.pol
+++ b/bin/python/isc/tests/test-policies/03-postpublish.pol
@@ -1,31 +1,47 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy postpublish_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+       algorithm rsasha1;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 2w;
+       post-publish zsk 2w;
+       roll-period ksk 1y;
+       pre-publish ksk 1mo;
+       post-publish ksk 2mo;
+       keyttl 1h;
+       key-size ksk 2048;
+       key-size zsk 1024;
 };
 
 // Policy that defines a post-publish period lower than the rollover period
 zone good_postpublish.test {
-        policy postpublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
+       policy postpublish_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 1mo;
 };
 
 // Policy that defines a post-publish period equal to the rollover period
 zone bad_postpublish.test {
-        policy postpublish_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 4mo;
+       policy postpublish_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 4mo;
 };
 
 

diff --git a/bin/python/isc/tests/test-policies/04-combined-pre-post.pol b/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
index 5695559b67f831024c2d2261d99ac0b483e58738..182c087ca6477ba68b5b3765c3a3b5bd450cc624 100644 (file)
--- a/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
+++ b/bin/python/isc/tests/test-policies/04-combined-pre-post.pol
@@ -1,55 +1,71 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy combined_pre_post_rsa {
-        algorithm rsasha1;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2w;
-        post-publish zsk 2w;
-        roll-period ksk 1y;
-        pre-publish ksk 1mo;
-        post-publish ksk 2mo;
-        keyttl 1h;
-        key-size ksk 2048;
-        key-size zsk 1024;
+       algorithm rsasha1;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 2w;
+       post-publish zsk 2w;
+       roll-period ksk 1y;
+       pre-publish ksk 1mo;
+       post-publish ksk 2mo;
+       keyttl 1h;
+       key-size ksk 2048;
+       key-size zsk 1024;
 };
 
 // Policy that defines a combined pre-publish and post-publish period lower
 // than the rollover period
 zone good_combined_pre_post_ksk.test {
-        policy combined_pre_post_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 1mo;
-        post-publish ksk 1mo;
+       policy combined_pre_post_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 1mo;
+       post-publish ksk 1mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period higher
 // than the rollover period
 zone bad_combined_pre_post_ksk.test {
-        policy combined_pre_post_rsa;
-        coverage 6mo;
-        roll-period ksk 4mo;
-        pre-publish ksk 2mo;
-        post-publish ksk 2mo;
+       policy combined_pre_post_rsa;
+       coverage 6mo;
+       roll-period ksk 4mo;
+       pre-publish ksk 2mo;
+       post-publish ksk 2mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period lower
 // than the rollover period
 zone good_combined_pre_post_zsk.test {
-        policy combined_pre_post_rsa;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 1mo;
-        post-publish zsk 1mo;
+       policy combined_pre_post_rsa;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 1mo;
+       post-publish zsk 1mo;
 };
 
 // Policy that defines a combined pre-publish and post-publish period higher
 // than the rollover period
 zone bad_combined_pre_post_zsk.test {
-        policy combined_pre_post_rsa;
-        coverage 1y;
-        roll-period zsk 3mo;
-        pre-publish zsk 2mo;
-        post-publish zsk 2mo;
+       policy combined_pre_post_rsa;
+       coverage 1y;
+       roll-period zsk 3mo;
+       pre-publish zsk 2mo;
+       post-publish zsk 2mo;
 };
 
 

diff --git a/bin/python/isc/utils.py.in b/bin/python/isc/utils.py.in
index 48b9685f3332853a1b3a87992bc632171b79688e..cac42e8ab48da96d69ddde26b32b26da4168e6d9 100644 (file)
--- a/bin/python/isc/utils.py.in
+++ b/bin/python/isc/utils.py.in
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -13,9 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 ############################################################################
-# utils.py
-# Grouping shared code in one place
-############################################################################
 
 import os
 

diff --git a/bin/tests/system/keymgr/01-ksk-inactive/README b/bin/tests/system/keymgr/01-ksk-inactive/README
index b807029d4a52f0cbe48ed65c5df09e9305276b3c..e1adb738707abc693d87043be551a5c114a8b377 100644 (file)
--- a/bin/tests/system/keymgr/01-ksk-inactive/README
+++ b/bin/tests/system/keymgr/01-ksk-inactive/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The KSK is deactivated prior to
 its replacement being activated.

diff --git a/bin/tests/system/keymgr/02-zsk-inactive/README b/bin/tests/system/keymgr/02-zsk-inactive/README
index bf56562b9ab44ddb8eb6bc2aae08c41a8f01ec7d..71e47aab6da2f700514b412b2461c6f17048d2d2 100644 (file)
--- a/bin/tests/system/keymgr/02-zsk-inactive/README
+++ b/bin/tests/system/keymgr/02-zsk-inactive/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one ZSK rollover.  The first ZSK is deactivated
 prior to its replacement being activated.

diff --git a/bin/tests/system/keymgr/03-ksk-unpublished/README b/bin/tests/system/keymgr/03-ksk-unpublished/README
index 0581c6756c75b339defd79e50153224ded8d97db..d9d54f07997295ac0d487563d39b9191d3a42d1f 100644 (file)
--- a/bin/tests/system/keymgr/03-ksk-unpublished/README
+++ b/bin/tests/system/keymgr/03-ksk-unpublished/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set contains one KSK rollover.  The KSK is unpublished before its
 successor is published.

diff --git a/bin/tests/system/keymgr/04-zsk-unpublished/README b/bin/tests/system/keymgr/04-zsk-unpublished/README
index 589490d59777d1c8e22b1c7444a0a490b4a757ef..eea77265760aa994a31b3e20717415673c7b6724 100644 (file)
--- a/bin/tests/system/keymgr/04-zsk-unpublished/README
+++ b/bin/tests/system/keymgr/04-zsk-unpublished/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set contains one ZSK rollover.  The ZSK is unpublished before its
 successor is published.

diff --git a/bin/tests/system/keymgr/05-ksk-unpub-active/README b/bin/tests/system/keymgr/05-ksk-unpub-active/README
index 026028c5b5ca6b227c18da5d61294eec5144849a..bd1b3b8626bcdd8cdd4c55855403c22e6fdfdaaa 100644 (file)
--- a/bin/tests/system/keymgr/05-ksk-unpub-active/README
+++ b/bin/tests/system/keymgr/05-ksk-unpub-active/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 and its successor activated.

diff --git a/bin/tests/system/keymgr/06-zsk-unpub-active/README b/bin/tests/system/keymgr/06-zsk-unpub-active/README
index 026028c5b5ca6b227c18da5d61294eec5144849a..bd1b3b8626bcdd8cdd4c55855403c22e6fdfdaaa 100644 (file)
--- a/bin/tests/system/keymgr/06-zsk-unpub-active/README
+++ b/bin/tests/system/keymgr/06-zsk-unpub-active/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes one KSK rollover.  The first KSK is deleted
 and its successor published prior to the first KSK being deactivated
 and its successor activated.

diff --git a/bin/tests/system/keymgr/07-ksk-ttl/README b/bin/tests/system/keymgr/07-ksk-ttl/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/07-ksk-ttl/README
+++ b/bin/tests/system/keymgr/07-ksk-ttl/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/08-zsk-ttl/README b/bin/tests/system/keymgr/08-zsk-ttl/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/08-zsk-ttl/README
+++ b/bin/tests/system/keymgr/08-zsk-ttl/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/09-no-keys/README b/bin/tests/system/keymgr/09-no-keys/README
index 6295fa32b069367e88ced105397e71f6df0972b1..9798370f5522b52132cbed599557ae64c4ffcc5a 100644 (file)
--- a/bin/tests/system/keymgr/09-no-keys/README
+++ b/bin/tests/system/keymgr/09-no-keys/README
@@ -1 +1,4 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This directory has no key set, but one will be initialized by dnssec-keymgr.

diff --git a/bin/tests/system/keymgr/10-change-roll/README b/bin/tests/system/keymgr/10-change-roll/README
index 26073c37790fce0f4e93f62e38633d928e5b3320..60db6f31769f3b60c3f9afd47671385b399d1cf8 100644 (file)
--- a/bin/tests/system/keymgr/10-change-roll/README
+++ b/bin/tests/system/keymgr/10-change-roll/README
@@ -1,3 +1,6 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This directory has a key set which is valid, but has a ZSK rollover period
 of only three months. It will be updated to have a ZSK rollover period of
 one year.

diff --git a/bin/tests/system/keymgr/11-many-simul/README b/bin/tests/system/keymgr/11-many-simul/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/11-many-simul/README
+++ b/bin/tests/system/keymgr/11-many-simul/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/12-many-active/README b/bin/tests/system/keymgr/12-many-active/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/12-many-active/README
+++ b/bin/tests/system/keymgr/12-many-active/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/13-noroll/README b/bin/tests/system/keymgr/13-noroll/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/13-noroll/README
+++ b/bin/tests/system/keymgr/13-noroll/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/14-wrongalg/README b/bin/tests/system/keymgr/14-wrongalg/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/14-wrongalg/README
+++ b/bin/tests/system/keymgr/14-wrongalg/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/15-unspec/README b/bin/tests/system/keymgr/15-unspec/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/15-unspec/README
+++ b/bin/tests/system/keymgr/15-unspec/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/16-wrongalg-unspec/README b/bin/tests/system/keymgr/16-wrongalg-unspec/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/16-wrongalg-unspec/README
+++ b/bin/tests/system/keymgr/16-wrongalg-unspec/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/17-noforce/README b/bin/tests/system/keymgr/17-noforce/README
index 8b9dc02503c197fdd456f67fd61bd0dd2639e6f2..ada05baef5f18c154aee00caa6b334b55818e694 100644 (file)
--- a/bin/tests/system/keymgr/17-noforce/README
+++ b/bin/tests/system/keymgr/17-noforce/README
@@ -1,2 +1,5 @@
+Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This set includes a KSK rollover, with insufficient delay between
 prepublication and rollover.

diff --git a/bin/tests/system/keymgr/policy.conf b/bin/tests/system/keymgr/policy.conf
index e6b7d98c1aa4b003e944089d65cd19fcb465ca2e..12ffe8c9228a5a5a1c352cdd942f8356156931be 100644 (file)
--- a/bin/tests/system/keymgr/policy.conf
+++ b/bin/tests/system/keymgr/policy.conf
@@ -1,10 +1,26 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy default {
-        policy global;
-        algorithm nsec3rsasha1;
-        key-size zsk 1024;
-        pre-publish zsk 6w;
-        post-publish zsk 6w;
-        roll-period zsk 6mo;
-        roll-period ksk 0;
-        coverage 364d;
+       policy global;
+       algorithm nsec3rsasha1;
+       key-size zsk 1024;
+       pre-publish zsk 6w;
+       post-publish zsk 6w;
+       roll-period zsk 6mo;
+       roll-period ksk 0;
+       coverage 364d;
 };

diff --git a/bin/tests/system/keymgr/policy.good b/bin/tests/system/keymgr/policy.good
index 0038a2793986dc6234214411716779e5e2979a9b..8586ef24a9d17e96650d4de9c31b9bb4591cd598 100644 (file)
--- a/bin/tests/system/keymgr/policy.good
+++ b/bin/tests/system/keymgr/policy.good
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 policy default:
        inherits global
        directory None

diff --git a/bin/tests/system/keymgr/policy.sample b/bin/tests/system/keymgr/policy.sample
index d96a40dce90060045f0f6f4988324785c9dc2e10..ecc57588b1ccd8b1dda9f611e5f5a53da28069e3 100644 (file)
--- a/bin/tests/system/keymgr/policy.sample
+++ b/bin/tests/system/keymgr/policy.sample
@@ -1,30 +1,46 @@
+/*
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 # a comment which should be skipped
 
 algorithm-policy rsasha1 {
-        key-size ksk 2048;
-        key-size zsk 1024;     // this too
+       key-size ksk 2048;
+       key-size zsk 1024;     // this too
 };
 
 // and this
 
 policy default {
-        directory "keydir";
-        algorithm rsasha1;
-        coverage 1y;            # another comment
-        roll-period zsk 6mo;    // and yet another
-        pre-publish zsk 6w;
-        post-publish zsk 6w;
-        keyttl 1h;
+       directory "keydir";
+       algorithm rsasha1;
+       coverage 1y;            # another comment
+       roll-period zsk 6mo;    // and yet another
+       pre-publish zsk 6w;
+       post-publish zsk 6w;
+       keyttl 1h;
 };
 
 policy extra {
-        policy default;
-        coverage 5y;
-        roll-period KSK 1 year;
-        roll-period zsk 3mo;
-        pre-publish ksk 3mo;
-        post-publish zsk 1w;
-        keyttl 2h;
+       policy default;
+       coverage 5y;
+       roll-period KSK 1 year;
+       roll-period zsk 3mo;
+       pre-publish ksk 3mo;
+       post-publish zsk 1w;
+       keyttl 2h;
 };
 
 /*
@@ -34,7 +50,7 @@ policy extra {
  */
 
 zone example.com {
-        policy extra;
-        coverage 5 mon;
-        algorithm nsec3rsasha1;
+       policy extra;
+       coverage 5 mon;
+       algorithm nsec3rsasha1;
 };

diff --git a/bin/tests/system/keymgr/testpolicy.py b/bin/tests/system/keymgr/testpolicy.py
index 2dec7ff5f329903f02fff48e10e37a0fcfb5e471..9bf9b72646141d262c6916b5b8c5303efbae8ba9 100644 (file)
--- a/bin/tests/system/keymgr/testpolicy.py
+++ b/bin/tests/system/keymgr/testpolicy.py
@@ -1,4 +1,19 @@
-#!/bin/python
+############################################################################
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
+
 import sys
 sys.path.insert(0, '../../../python')
 from isc import *