diff --git a/compat/arc4random.c b/compat/arc4random.c index 50950e89d..27a626b7b 100644 --- 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 diff --git a/compat/arc4random_uniform.c b/compat/arc4random_uniform.c index 52f6b9162..154260ebd 100644 --- 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 * Copyright (c) 2008, Damien Miller - * Copyright (c) 2013, Markus Friedl * * 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 +#include /* * Calculate a uniformly distributed random number less than upper_bound diff --git a/doc/Changelog b/doc/Changelog index 9d1cd7fbb..28d1f4a82 100644 --- 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).