Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblutil / entropy.c

diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index 74d3f3210ab8b875d5400428b230a376b47a061e..ef21cb6e3c197bad136eeba2d59b2f6de4b7e378 100644 (file)
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -1,7 +1,22 @@
+/* entropy.c -- routines for providing pseudo-random data */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2012 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This work was initially developed by Kurt D. Zeilenga for
+ * inclusion in OpenLDAP Software based, in part, on publically
+ * available works (as noted below).
  */
 
 #include "portable.h"
@@ -58,7 +73,7 @@ int lutil_entropy( unsigned char *buf, ber_len_t nbytes )
                close(fd);
                return nbytes > 0 ? -1 : 0;
        }
-#elif PROV_RSA_FULL
+#elif defined(PROV_RSA_FULL)
        {
                /* Not used since _WIN32_WINNT not set... */
                HCRYPTPROV hProv = 0;
@@ -122,7 +137,7 @@ int lutil_entropy( unsigned char *buf, ber_len_t nbytes )
 
                for( n = 0; n < nbytes; n += 16 ) {
                        struct lutil_MD5Context ctx;
-                       char digest[16];
+                       unsigned char digest[16];
 
                        /* poor resolution */
 #ifdef HAVE_GETTIMEOFDAY