Fix ldaps / TLS processing...

[openldap] / libraries / liblutil / entropy.c

diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index 4e0b2ec17f759ee3bd1bb93eb439190a34993d9c..6b7c6c9552f50c036185ed62607fd551672a0f60 100644 (file)
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -24,14 +24,17 @@
 /*
  * lutil_entropy() provides nbytes of entropy in buf.
  * Quality offerred is suitable for one-time uses, such as "once" keys.
+ * Values may not be suitable for multi-time uses.
  *
  * Note:  Callers are encouraged to provide additional bytes of
  * of entropy in the buf argument.  This information is used in
  * fallback mode to improve the quality of bytes returned.
+ *
+ * This routinue should be extended to support additional sources
+ * of entropy.
  */
-int lutil_entropy( char *buf, int nbytes )
+int lutil_entropy( char *buf, ber_len_t nbytes )
 {
-       if( nbytes < 0 ) return -1;
        if( nbytes == 0 ) return 0;
 
 #ifdef URANDOM_DEVICE
@@ -74,10 +77,11 @@ int lutil_entropy( char *buf, int nbytes )
 #else
        {
                /* based upon Phil Karn's "practical randomness" idea
-                * but implementation 100% OpenLDAP.  So don't blame Phil. */
-               /* worse case is this is a MD5 hash of a counter, if
-                *      MD5 is a strong cryptographic hash, this should
-                *      be fairly resistant to attack
+                * but implementation 100% OpenLDAP.  So don't blame Phil.
+                *
+                * Worse case is that this is a MD5 hash of a counter, if
+                * MD5 is a strong cryptographic hash, this should be fairly
+                * resistant to attack
                 */
 
                /*
@@ -86,7 +90,7 @@ int lutil_entropy( char *buf, int nbytes )
                 * access to this counter may not be atomic.
                 */
                static int counter = 0;
-               int n;
+               ber_len_t n;
 
                struct rdata_s {
                        int counter;