Merge branch '313-fix-spurious-entropy.h-installation' into 'master'

Resolve ""make install" error on master - missing `entropy.h`"

Closes #313

See merge request isc-projects/bind9!346

lib/dns/rbtdb.c

@@ -5419,8 +5419,8 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
 		 * Force expire with 25% probability.
 		 * XXXDCL Could stand to have a better policy, like LRU.
 		 */
-		force_expire = ISC_TF(rbtnode->down == NULL && 
-                                      (isc_random32() % 4) == 0);
+		force_expire = ISC_TF(rbtnode->down == NULL &&
+				      (isc_random32() % 4) == 0);
 
 		/*
 		 * Note that 'log' can be true IFF overmem is also true.

lib/isc/entropy_private.h

@@ -16,7 +16,7 @@
 
 #include <isc/lang.h>
 
-/*! \file isc/entropy.h
+/*! \file isc/entropy_private.h
  * \brief Implements wrapper around CSPRNG cryptographic library calls
  * for getting cryptographically secure pseudo-random numbers.
  *

lib/isc/include/isc/Makefile.in

@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@
 HEADERS =	aes.h app.h assertions.h backtrace.h base32.h base64.h \
 		bind9.h boolean.h buffer.h bufferlist.h \
 		commandline.h counter.h crc64.h deprecated.h \
-		entropy.h errno.h error.h event.h eventclass.h \
+		errno.h error.h event.h eventclass.h \
 		file.h formatcheck.h fsaccess.h fuzz.h \
 		hash.h heap.h hex.h hmacmd5.h hmacsha.h ht.h httpd.h \
 		interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \

lib/isc/random.c

@@ -104,13 +104,13 @@ isc_random_buf(void *buf, size_t buflen) {
 	for (i = 0; i + sizeof(r) <= buflen; i += sizeof(r)) {
 		r = next();
 		memmove((uint8_t *)buf + i, &r, sizeof(r)); /* Buffers cannot
-		                                            * really overlap
-		                                            * here */
+							    * really overlap
+							    * here */
 	}
 	r = next();
 	memmove((uint8_t *)buf + i, &r, buflen % sizeof(r)); /* Buffer cannot
-	                                                     * really overlap
-	                                                     * here */
+							     * really overlap
+							     * here */
 	return;
 }
 

util/copyrights

@@ -3483,7 +3483,6 @@
 ./lib/isc/counter.c				C	2014,2016,2018
 ./lib/isc/crc64.c				C	2013,2016,2018
 ./lib/isc/entropy.c				C	2018
-./lib/isc/entropy.h				C	2018
 ./lib/isc/entropy_private.h			C	2018
 ./lib/isc/error.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
 ./lib/isc/event.c				C	1998,1999,2000,2001,2004,2005,2007,2014,2016,2017,2018