From d9012051913e41c3fcb93bde3aa476968bb015ab Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Tue, 18 Aug 2015 23:46:14 +0000
Subject: [PATCH] update copyright notice / whitespace

---
 CHANGES                    |  2 +-
 lib/dns/client.c           |  2 +-
 lib/dns/opensslgost_link.c |  2 +-
 lib/isc/hmacmd5.c          |  2 +-
 lib/isc/hmacsha.c          |  2 +-
 lib/isc/include/isc/safe.h |  2 +-
 lib/isc/safe.c             | 33 ++++++++++++++++-----------------
 lib/isc/tests/safe_test.c  |  2 +-
 8 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/CHANGES b/CHANGES
index cad63ce723..2de3d7438a 100644
--- 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 22df05dd04..b433e348fe 100644
--- 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 2bd1bb1484..dd421b8ddd 100644
--- 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 e054c08a97..d27bfe42a7 100644
--- 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 9491dd9d41..fa905e0685 100644
--- 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 b2495e962f..c6a3033525 100644
--- 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 a6d010ff64..8ac4a5b919 100644
--- 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 113ec8efc5..377d2ced97 100644
--- 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