planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved random generation.

Browse Source 
FossilOrigin-Name: 090238dd1d98eeb490edd893288236e8cf2083822bd65981add1278a489fcae7
This commit is contained in:
7u83@mail.ru 2015-03-08 10:36:30 +00:00
parent 1cef81b22d
commit c0dc04b60d
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/capwap/Makefile
View File

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

38
src/capwap/cw_rand.c
View File

@ -16,6 +16,7 @@
*/ */
#include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -31,7 +32,7 @@
char * cw_rand_dev = "/dev/random"; 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 rf;
int l; int l;
@ -40,7 +41,7 @@ int cw_rand(uint8_t*dst, int len)
if (rf<0){ if (rf<0){
cw_log(LOG_ERR,"Can't open %s: %s",cw_rand_dev,strerror(errno)); 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)){ if ((l<0) && (errno != EAGAIN)){
cw_log(LOG_ERR,"Cant read from %s: %s",cw_rand_dev,strerror(errno)); 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); cw_dbg(DBG_CW_INFO,"Not enough entropy reading from %s, using pseudo rand",cw_rand_dev);
return cw_pseudo_rand(dst,len); return cw_pseudo_rand(dst,len);
} }
*/
return l; 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;
}

1
src/capwap/cw_util.h
View File

@ -26,7 +26,6 @@ extern int cw_foreach_msgelem(uint8_t * msgelems, int len,
int (*callback)(void*,int,uint8_t*,int),void *arg ); 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_rand(uint8_t*dst, int len);
extern int cw_is_printable(const uint8_t * s,int len); extern int cw_is_printable(const uint8_t * s,int len);