update copyright notice

diff --git a/bin/pkcs11/pkcs11-keygen.docbook b/bin/pkcs11/pkcs11-keygen.docbook
index 56fd3c639c2c970fb29f290767973b1f2baaa4a2..7af6ed932e6411891a7f792aa5a1177c72f868e1 100644 (file)
--- a/bin/pkcs11/pkcs11-keygen.docbook
+++ b/bin/pkcs11/pkcs11-keygen.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
                [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009  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
@@ -36,7 +36,7 @@
 
   <docinfo>
     <copyright>
-      <year>2012</year>
+      <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/tests/hashes/Makefile.in b/bin/tests/hashes/Makefile.in
index 0f7ade1d36b1cc4d60370a49678291bd87d8fc89..3fccdb38e534318258947608f360c08475a0a255 100644 (file)
--- a/bin/tests/hashes/Makefile.in
+++ b/bin/tests/hashes/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2010,2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012  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/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 1f25601faca6828ba17c39f7f6441cc8b3c83159..e6f04e3d1a4c89193cf36a455f15ce3e004a2b59 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/pkcs11/clean.sh b/bin/tests/system/pkcs11/clean.sh
index 14ec7257ec91bf5d90057e542cbdd465eaadc9fb..3e4651d446db2b09f8c65ce0795d03f374107c02 100644 (file)
--- a/bin/tests/system/pkcs11/clean.sh
+++ b/bin/tests/system/pkcs11/clean.sh
@@ -14,6 +14,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
+# $Id$
+
 rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
 rm -f dig.out random.data pin
 rm -f ns1/*.key ns1/named.memstats

diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index d553091cb6911b026a011f0a782f16cc49d7cf58..1cec832fdf212d9cb857ca5a5155891d165d3a1b 100644 (file)
--- a/bin/tests/system/pkcs11/setup.sh
+++ b/bin/tests/system/pkcs11/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2013  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/lib/dns/opensslgost_link.c b/lib/dns/opensslgost_link.c
index 2a38591c45235fe6a0a88940c2aedbc71c69eee6..e10f9f4808d35666b49f4f4e47673eea877a5c82 100644 (file)
--- a/lib/dns/opensslgost_link.c
+++ b/lib/dns/opensslgost_link.c
@@ -463,7 +463,7 @@ opensslgost_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
        } else {
                INSIST((priv.elements[0].tag == TAG_GOST_PRIVASN1) ||
                       (priv.elements[0].tag == TAG_GOST_PRIVRAW));
-       
+
                if (priv.elements[0].tag == TAG_GOST_PRIVASN1) {
                        p = priv.elements[0].data;
                        if (d2i_PrivateKey(NID_id_GostR3410_2001, &pkey, &p,
@@ -476,12 +476,12 @@ opensslgost_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
                                eckey = EVP_PKEY_get0(pub->keydata.pkey);
                                pubkey = EC_KEY_get0_public_key(eckey);
                        }
-       
+
                        privkey = BN_bin2bn(priv.elements[0].data,
                                            priv.elements[0].length, NULL);
                        if (privkey == NULL)
                                DST_RET(ISC_R_NOMEMORY);
-       
+
                        /* can't create directly the whole key */
                        p = gost_dummy_key;
                        if (d2i_PrivateKey(NID_id_GostR3410_2001, &pkey, &p,
@@ -489,14 +489,14 @@ opensslgost_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
                                DST_RET(dst__openssl_toresult2(
                                            "d2i_PrivateKey",
                                            DST_R_INVALIDPRIVATEKEY));
-       
+
                        eckey = EVP_PKEY_get0(pkey);
                        if (eckey == NULL)
                                return (dst__openssl_toresult(
                                            DST_R_OPENSSLFAILURE));
                        if (!EC_KEY_set_private_key(eckey, privkey))
                                DST_RET(ISC_R_NOMEMORY);
-       
+
                        /* have to (re)set the public key */
 #ifdef notyet
                        (void) gost2001_compute_public(eckey);

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 7bda5159a2c107ff42050e53f2e41d5b7e32746b..417315bcd0da0905f85c93409f60533ccddf037b 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -102,7 +102,7 @@ fromtext_rrsig(ARGS_FROMTEXT) {
                        RETTOK(ISC_R_RANGE);
                time_expire = l;
        } else
-                RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
+               RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
        RETERR(uint32_tobuffer(time_expire, target));
 
        /*