Improved random generation.

FossilOrigin-Name: 090238dd1d98eeb490edd893288236e8cf2083822bd65981add1278a489fcae7

src/capwap/Makefile

@@ -47,7 +47,6 @@ UTILOBJS= \
 	cw_setstr.o \
 	cw_is_printable.o \
 	cw_rand.o \
-	cw_pseudo_rand.o \
 	cw_foreach_msgelem.o \
 	avltree.o \
 	avltree_get.o \

src/capwap/cw_rand.c

@@ -16,6 +16,7 @@
 
 */
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +32,7 @@
 
 char * cw_rand_dev = "/dev/random";
 
-int cw_rand(uint8_t*dst, int len)
+int cw_rand_r(uint8_t*dst, int len)
 {
 	int rf;
 	int l;
@@ -40,7 +41,7 @@ int cw_rand(uint8_t*dst, int len)
 	if (rf<0){
 
 		cw_log(LOG_ERR,"Can't open %s: %s",cw_rand_dev,strerror(errno));
-		return cw_pseudo_rand(dst,len);
+		return 0;
 	}
 
 
@@ -49,13 +50,40 @@ int cw_rand(uint8_t*dst, int len)
 
 	if ((l<0) && (errno != EAGAIN)){
 		cw_log(LOG_ERR,"Cant read from %s: %s",cw_rand_dev,strerror(errno));
-		return cw_pseudo_rand(dst,len);
+		return 0;
 	}
 
-	if (l<len){
+/*	if (l<len){
 		cw_dbg(DBG_CW_INFO,"Not enough entropy reading from %s, using pseudo rand",cw_rand_dev);
 		return cw_pseudo_rand(dst,len);
 	}
-	
+	*/
 	return l;
 }
+
+
+
+
+int cw_rand(uint8_t *dst, int len)
+{
+	static int init = 1;
+	if (init){
+		uint32_t rinit=time(NULL);
+
+		int l = cw_rand_r((uint8_t*)(&rinit),sizeof(uint32_t));
+		if (l<sizeof(uint32_t))
+			cw_dbg(DBG_CW_INFO,"Not enough entropy reading from %s, using pseudo rand",cw_rand_dev);
+	
+
+
+		srand(rinit);
+		init =0;
+	}
+	int i;
+	for (i=0; i<len; i++){
+		dst[i]=rand();
+	}
+	return len;
+}
+
+

src/capwap/cw_util.h

@@ -26,7 +26,6 @@ extern int cw_foreach_msgelem(uint8_t * msgelems,  int len,
 		int (*callback)(void*,int,uint8_t*,int),void *arg );
 
 
-extern int cw_pseudo_rand(uint8_t *dst, int len);
 extern int cw_rand(uint8_t*dst, int len);
 
 extern int cw_is_printable(const uint8_t * s,int len);