mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 18:19:42 +00:00
Code Issues Releases Wiki Activity

[master] copyrights

Browse Source
This commit is contained in:
Evan Hunt 2016-04-28 22:30:53 -07:00
parent 168cf0ede1
commit a27dc50157
46 changed files with 331 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/python/Makefile.in
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/dnssec-checkds.py.in
View File

@ -1,6 +1,6 @@
#!@PYTHON@ #!@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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

3
bin/python/dnssec-coverage.docbook
View File

@ -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 - Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above - purpose with or without fee is hereby granted, provided that the above
@ -40,6 +40,7 @@
<year>2013</year> <year>2013</year>
<year>2014</year> <year>2014</year>
<year>2015</year> <year>2015</year>
<year>2016</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder> <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright> </copyright>
</docinfo> </docinfo>

2
bin/python/dnssec-coverage.py.in
View File

@ -1,6 +1,6 @@
#!@PYTHON@ #!@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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/dnssec-keymgr.py.in
View File

@ -1,6 +1,6 @@
#!@PYTHON@ #!@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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/Makefile.in
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

21
bin/python/isc/__init__.py
View File

@ -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 # purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies. # copyright notice and this permission notice appear in all copies.
# #
# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM # THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL # AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # PERFORMANCE OF THIS SOFTWARE.
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ############################################################################
__all__ = ['dnskey', 'eventlist', 'keydict', 'keyevent', 'keyseries', __all__ = ['dnskey', 'eventlist', 'keydict', 'keyevent', 'keyseries',
'keyzone', 'policy', 'parsetab', 'utils'] 'keyzone', 'policy', 'parsetab', 'utils']

2
bin/python/isc/checkds.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/coverage.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/dnskey.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/eventlist.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/keydict.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/keyevent.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/keymgr.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/keyseries.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/keyzone.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

5
bin/python/isc/policy.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # 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 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
############################################################################ ############################################################################
# policy.py
# This module implements the parser for the dnssec.policy file.
############################################################################
import re import re
import ply.lex as lex import ply.lex as lex

2
bin/python/isc/tests/Makefile.in
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/tests/dnskey_test.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

2
bin/python/isc/tests/policy_test.py
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above

64
bin/python/isc/tests/test-policies/01-keysize.pol
View File

@ -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 { policy keysize_rsa {
algorithm rsasha1; algorithm rsasha1;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 2w; pre-publish zsk 2w;
post-publish zsk 2w; post-publish zsk 2w;
roll-period ksk 1y; roll-period ksk 1y;
pre-publish ksk 1mo; pre-publish ksk 1mo;
post-publish ksk 2mo; post-publish ksk 2mo;
keyttl 1h; keyttl 1h;
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; key-size zsk 1024;
}; };
policy keysize_dsa { policy keysize_dsa {
algorithm dsa; algorithm dsa;
coverage 1y; coverage 1y;
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; key-size zsk 1024;
}; };
zone good_rsa.test { zone good_rsa.test {
policy keysize_rsa; policy keysize_rsa;
}; };
zone bad_rsa.test { zone bad_rsa.test {
policy keysize_rsa; policy keysize_rsa;
key-size ksk 511; key-size ksk 511;
}; };
zone good_dsa.test { zone good_dsa.test {
policy keysize_dsa; policy keysize_dsa;
key-size ksk 1024; key-size ksk 1024;
key-size zsk 768; key-size zsk 768;
}; };
zone bad_dsa.test { zone bad_dsa.test {
policy keysize_dsa; policy keysize_dsa;
key-size ksk 1024; key-size ksk 1024;
key-size zsk 769; key-size zsk 769;
}; };

54
bin/python/isc/tests/test-policies/02-prepublish.pol
View File

@ -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 { policy prepublish_rsa {
algorithm rsasha1; algorithm rsasha1;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 2w; pre-publish zsk 2w;
post-publish zsk 2w; post-publish zsk 2w;
roll-period ksk 1y; roll-period ksk 1y;
pre-publish ksk 1mo; pre-publish ksk 1mo;
post-publish ksk 2mo; post-publish ksk 2mo;
keyttl 1h; keyttl 1h;
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; key-size zsk 1024;
}; };
// Policy that defines a pre-publish period lower than the rollover period // Policy that defines a pre-publish period lower than the rollover period
zone good_prepublish.test { zone good_prepublish.test {
policy prepublish_rsa; policy prepublish_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 1mo; pre-publish ksk 1mo;
}; };
// Policy that defines a pre-publish period equal to the rollover period // Policy that defines a pre-publish period equal to the rollover period
zone bad_prepublish.test { zone bad_prepublish.test {
policy prepublish_rsa; policy prepublish_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 4mo; pre-publish ksk 4mo;
}; };

54
bin/python/isc/tests/test-policies/03-postpublish.pol
View File

@ -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 { policy postpublish_rsa {
algorithm rsasha1; algorithm rsasha1;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 2w; pre-publish zsk 2w;
post-publish zsk 2w; post-publish zsk 2w;
roll-period ksk 1y; roll-period ksk 1y;
pre-publish ksk 1mo; pre-publish ksk 1mo;
post-publish ksk 2mo; post-publish ksk 2mo;
keyttl 1h; keyttl 1h;
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; key-size zsk 1024;
}; };
// Policy that defines a post-publish period lower than the rollover period // Policy that defines a post-publish period lower than the rollover period
zone good_postpublish.test { zone good_postpublish.test {
policy postpublish_rsa; policy postpublish_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 1mo; pre-publish ksk 1mo;
}; };
// Policy that defines a post-publish period equal to the rollover period // Policy that defines a post-publish period equal to the rollover period
zone bad_postpublish.test { zone bad_postpublish.test {
policy postpublish_rsa; policy postpublish_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 4mo; pre-publish ksk 4mo;
}; };

78
bin/python/isc/tests/test-policies/04-combined-pre-post.pol
View File

@ -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 { policy combined_pre_post_rsa {
algorithm rsasha1; algorithm rsasha1;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 2w; pre-publish zsk 2w;
post-publish zsk 2w; post-publish zsk 2w;
roll-period ksk 1y; roll-period ksk 1y;
pre-publish ksk 1mo; pre-publish ksk 1mo;
post-publish ksk 2mo; post-publish ksk 2mo;
keyttl 1h; keyttl 1h;
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; key-size zsk 1024;
}; };
// Policy that defines a combined pre-publish and post-publish period lower // Policy that defines a combined pre-publish and post-publish period lower
// than the rollover period // than the rollover period
zone good_combined_pre_post_ksk.test { zone good_combined_pre_post_ksk.test {
policy combined_pre_post_rsa; policy combined_pre_post_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 1mo; pre-publish ksk 1mo;
post-publish ksk 1mo; post-publish ksk 1mo;
}; };
// Policy that defines a combined pre-publish and post-publish period higher // Policy that defines a combined pre-publish and post-publish period higher
// than the rollover period // than the rollover period
zone bad_combined_pre_post_ksk.test { zone bad_combined_pre_post_ksk.test {
policy combined_pre_post_rsa; policy combined_pre_post_rsa;
coverage 6mo; coverage 6mo;
roll-period ksk 4mo; roll-period ksk 4mo;
pre-publish ksk 2mo; pre-publish ksk 2mo;
post-publish ksk 2mo; post-publish ksk 2mo;
}; };
// Policy that defines a combined pre-publish and post-publish period lower // Policy that defines a combined pre-publish and post-publish period lower
// than the rollover period // than the rollover period
zone good_combined_pre_post_zsk.test { zone good_combined_pre_post_zsk.test {
policy combined_pre_post_rsa; policy combined_pre_post_rsa;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 1mo; pre-publish zsk 1mo;
post-publish zsk 1mo; post-publish zsk 1mo;
}; };
// Policy that defines a combined pre-publish and post-publish period higher // Policy that defines a combined pre-publish and post-publish period higher
// than the rollover period // than the rollover period
zone bad_combined_pre_post_zsk.test { zone bad_combined_pre_post_zsk.test {
policy combined_pre_post_rsa; policy combined_pre_post_rsa;
coverage 1y; coverage 1y;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish zsk 2mo; pre-publish zsk 2mo;
post-publish zsk 2mo; post-publish zsk 2mo;
}; };

5
bin/python/isc/utils.py.in
View File

@ -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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # 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 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
############################################################################ ############################################################################
# utils.py
# Grouping shared code in one place
############################################################################
import os import os

3
bin/tests/system/keymgr/01-ksk-inactive/README
View File

@ -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 This set includes one KSK rollover. The KSK is deactivated prior to
its replacement being activated. its replacement being activated.

3
bin/tests/system/keymgr/02-zsk-inactive/README
View File

@ -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 This set includes one ZSK rollover. The first ZSK is deactivated
prior to its replacement being activated. prior to its replacement being activated.

3
bin/tests/system/keymgr/03-ksk-unpublished/README
View File

@ -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 This set contains one KSK rollover. The KSK is unpublished before its
successor is published. successor is published.

3
bin/tests/system/keymgr/04-zsk-unpublished/README
View File

@ -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 This set contains one ZSK rollover. The ZSK is unpublished before its
successor is published. successor is published.

3
bin/tests/system/keymgr/05-ksk-unpub-active/README
View File

@ -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 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 published prior to the first KSK being deactivated
and its successor activated. and its successor activated.

3
bin/tests/system/keymgr/06-zsk-unpub-active/README
View File

@ -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 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 published prior to the first KSK being deactivated
and its successor activated. and its successor activated.

3
bin/tests/system/keymgr/07-ksk-ttl/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/08-zsk-ttl/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/09-no-keys/README
View File

@ -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. This directory has no key set, but one will be initialized by dnssec-keymgr.

3
bin/tests/system/keymgr/10-change-roll/README
View File

@ -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 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 of only three months. It will be updated to have a ZSK rollover period of
one year. one year.

3
bin/tests/system/keymgr/11-many-simul/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/12-many-active/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/13-noroll/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/14-wrongalg/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/15-unspec/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/16-wrongalg-unspec/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

3
bin/tests/system/keymgr/17-noforce/README
View File

@ -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 This set includes a KSK rollover, with insufficient delay between
prepublication and rollover. prepublication and rollover.

32
bin/tests/system/keymgr/policy.conf
View File

@ -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 default {
policy global; policy global;
algorithm nsec3rsasha1; algorithm nsec3rsasha1;
key-size zsk 1024; key-size zsk 1024;
pre-publish zsk 6w; pre-publish zsk 6w;
post-publish zsk 6w; post-publish zsk 6w;
roll-period zsk 6mo; roll-period zsk 6mo;
roll-period ksk 0; roll-period ksk 0;
coverage 364d; coverage 364d;
}; };

16
bin/tests/system/keymgr/policy.good
View File

@ -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: policy default:
inherits global inherits global
directory None directory None

54
bin/tests/system/keymgr/policy.sample
View File

@ -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 # a comment which should be skipped
algorithm-policy rsasha1 { algorithm-policy rsasha1 {
key-size ksk 2048; key-size ksk 2048;
key-size zsk 1024; // this too key-size zsk 1024; // this too
}; };
// and this // and this
policy default { policy default {
directory "keydir"; directory "keydir";
algorithm rsasha1; algorithm rsasha1;
coverage 1y; # another comment coverage 1y; # another comment
roll-period zsk 6mo; // and yet another roll-period zsk 6mo; // and yet another
pre-publish zsk 6w; pre-publish zsk 6w;
post-publish zsk 6w; post-publish zsk 6w;
keyttl 1h; keyttl 1h;
}; };
policy extra { policy extra {
policy default; policy default;
coverage 5y; coverage 5y;
roll-period KSK 1 year; roll-period KSK 1 year;
roll-period zsk 3mo; roll-period zsk 3mo;
pre-publish ksk 3mo; pre-publish ksk 3mo;
post-publish zsk 1w; post-publish zsk 1w;
keyttl 2h; keyttl 2h;
}; };
/* /*
@ -34,7 +50,7 @@ policy extra {
*/ */
zone example.com { zone example.com {
policy extra; policy extra;
coverage 5 mon; coverage 5 mon;
algorithm nsec3rsasha1; algorithm nsec3rsasha1;
}; };

17
bin/tests/system/keymgr/testpolicy.py
View File

@ -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 import sys
sys.path.insert(0, '../../../python') sys.path.insert(0, '../../../python')
from isc import * from isc import *