update copyright notice / whitespace

diff --git a/CHANGES b/CHANGES
index cad63ce723b716ceb4ec062b97ced7b7a16e10bb..2de3d7438a8ee94613ddbec459483b6b031a5612 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
                        code. Also, the timing-safe comparison functions have
                        been renamed to avoid possible confusion with
                        memcmp(). Thanks to Loganaden Velvindron of
-                        AFRINIC. [RT #40148]
+                       AFRINIC. [RT #40148]
 
 4182.  [cleanup]       Use mnemonics for RR class and type comparisons.
                        [RT #40297]

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 22df05dd049dd40985b51ab69cda9c0b2570293d..b433e348fe31c319f9769fc43da465cf1251da4c 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2013, 2015  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 2bd1bb1484b7eca011c923694f69e8fd8ba2089a..dd421b8ddd9fd84a4aebf0cab604c99c1ed2d431 100644 (file)
--- a/lib/dns/opensslgost_link.c
+++ b/lib/dns/opensslgost_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-2015  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/hmacmd5.c b/lib/isc/hmacmd5.c
index e054c08a9733b8873b9c583fa195d4dbfeddf976..d27bfe42a786ff55dafd0145861b918017753550 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index 9491dd9d417de6c2a335520f8ffde67fee000885..fa905e068569651d48100726fe261fd460a6986d 100644 (file)
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005-2007, 2009, 2011-2015  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/isc/safe.h b/lib/isc/include/isc/safe.h
index b2495e962fdfd0a3643eea9acf54c88d7aabf92b..c6a3033525513939875b307a4d185c1f14a5643c 100644 (file)
--- a/lib/isc/include/isc/safe.h
+++ b/lib/isc/include/isc/safe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2015  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/safe.c b/lib/isc/safe.c
index a6d010ff649e7f17fc56c235d50edee66c1eeebb..8ac4a5b9193faf859bff539807a8246dd6d50ada 100644 (file)
--- a/lib/isc/safe.c
+++ b/lib/isc/safe.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2014 Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -43,26 +42,26 @@ isc_safe_memequal(const void *s1, const void *s2, size_t n) {
 
 int
 isc_safe_memcompare(const void *b1, const void *b2, size_t len) {
-        const unsigned char *p1 = b1, *p2 = b2;
-        size_t i;
-        int res = 0, done = 0;
+       const unsigned char *p1 = b1, *p2 = b2;
+       size_t i;
+       int res = 0, done = 0;
 
-        for (i = 0; i < len; i++) {
-                /* lt is -1 if p1[i] < p2[i]; else 0. */
-                int lt = (p1[i] - p2[i]) >> CHAR_BIT;
+       for (i = 0; i < len; i++) {
+               /* lt is -1 if p1[i] < p2[i]; else 0. */
+               int lt = (p1[i] - p2[i]) >> CHAR_BIT;
 
-                /* gt is -1 if p1[i] > p2[i]; else 0. */
-                int gt = (p2[i] - p1[i]) >> CHAR_BIT;
+               /* gt is -1 if p1[i] > p2[i]; else 0. */
+               int gt = (p2[i] - p1[i]) >> CHAR_BIT;
 
-                /* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
-                int cmp = lt - gt;
+               /* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
+               int cmp = lt - gt;
 
-                /* set res = cmp if !done. */
-                res |= cmp & ~done;
+               /* set res = cmp if !done. */
+               res |= cmp & ~done;
 
-                /* set done if p1[i] != p2[i]. */
-                done |= lt | gt;
-        }
+               /* set done if p1[i] != p2[i]. */
+               done |= lt | gt;
+       }
 
-        return (res);
+       return (res);
 }

diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
index 113ec8efc5b35890997189fba070bef75d24b098..377d2ced978fb63b4830959d6a3bcdbbb590614a 100644 (file)
--- a/lib/isc/tests/safe_test.c
+++ b/lib/isc/tests/safe_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2015  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