- update compat/getentropy and arc4random to the most recent ones from OpenBSD.

git-svn-id: file:///svn/unbound/trunk@3184 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/compat/arc4random.c b/compat/arc4random.c
index 50950e89dc8de82705346c917a8a2fb3d766ee5b..27a626b7ba51813316d421a030a0c49c91230929 100644 (file)
--- a/compat/arc4random.c
+++ b/compat/arc4random.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: arc4random.c,v 1.40 2014/07/09 16:52:09 bcook Exp $   */
+/*      $OpenBSD: arc4random.c,v 1.41 2014/07/12 13:24:54 deraadt Exp $ */
 
 /*
  * Copyright (c) 1996, David Mazieres <dm@uun.org>

diff --git a/compat/arc4random_uniform.c b/compat/arc4random_uniform.c
index 52f6b9162063f6a3832f1c3ab9d1289969dd66fb..154260ebd78cdda8a68bf675d03595404493b3ca 100644 (file)
--- a/compat/arc4random_uniform.c
+++ b/compat/arc4random_uniform.c
@@ -1,9 +1,7 @@
-/*     $OpenBSD: arc4random.c,v 1.40 2014/07/09 16:52:09 bcook Exp $   */
+/*      $OpenBSD: arc4random_uniform.c,v 1.1 2014/07/12 13:24:54 deraadt Exp $  */
 
 /*
- * Copyright (c) 1996, David Mazieres <dm@uun.org>
  * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 #include "config.h"
+#include <sys/types.h>
+#include <stdlib.h>
 
 /*
  * Calculate a uniformly distributed random number less than upper_bound

diff --git a/doc/Changelog b/doc/Changelog
index 9d1cd7fbb90b8a725b19a4191ea66f4fd83fe719..28d1f4a82553242c078a82f07f3dc42357ae991e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,7 +3,7 @@
        - Fix to check openssl version number only for OpenSSL.
        - LibreSSL provides compat items, check for that in configure.
        - Fix bug in fix for log locks that caused deadlock in signal handler.
-       - update compat/getentropy to the most recent ones from OpenBSD.
+       - update compat/getentropy and arc4random to the most recent ones from OpenBSD.
 
 11 July 2014: Matthijs
        - fake-rfc2553 patch (thanks Benjamin Baier).