From bb8aad2148c9843d29d0894ae8979885c8dc13da Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 1 Aug 2017 23:48:35 +0000 Subject: [PATCH] update copyright notice / whitespace --- lib/dns/tests/dnstest.c | 2 +- lib/dns/tests/dnstest.h | 2 +- lib/dns/tests/rdata_test.c | 2 +- lib/isc/include/pkcs11/eddsa.h | 16 ++++++++++++++++ util/merge_copyrights | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index 6ca9afae3c..d3a3bdfac1 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011-2015, 2017 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/tests/dnstest.h b/lib/dns/tests/dnstest.h index 7181df6e40..f75fdbd5ef 100644 --- a/lib/dns/tests/dnstest.h +++ b/lib/dns/tests/dnstest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011, 2012, 2015, 2017 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/tests/rdata_test.c b/lib/dns/tests/rdata_test.c index 29920100cd..0d83642183 100644 --- a/lib/dns/tests/rdata_test.c +++ b/lib/dns/tests/rdata_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2012, 2013, 2015-2017 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/isc/include/pkcs11/eddsa.h b/lib/isc/include/pkcs11/eddsa.h index e43b3d5c13..420f7d7d99 100644 --- a/lib/isc/include/pkcs11/eddsa.h +++ b/lib/isc/include/pkcs11/eddsa.h @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2017 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. + */ + #ifndef _EDDSA_H_ #define _EDDSA_H_ 1 diff --git a/util/merge_copyrights b/util/merge_copyrights index 5e4dc66d05..7102dfd3d2 100644 --- a/util/merge_copyrights +++ b/util/merge_copyrights @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -w # -# Copyright (C) 2004-2007, 2009-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2007, 2009-2017 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any