diff options
Diffstat (limited to 'src/sh_entropy.c')
-rw-r--r-- | src/sh_entropy.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/sh_entropy.c b/src/sh_entropy.c index bf2a3ee..c55dad6 100644 --- a/src/sh_entropy.c +++ b/src/sh_entropy.c @@ -333,7 +333,7 @@ int sh_entropy(int nbytes, char * nbuf) if (nbytes > KEY_BYT) nbytes = KEY_BYT; - memset(nbuf, '\0', nbytes); + memset(nbuf, 0, nbytes); #ifdef NAME_OF_DEV_URANDOM m_count = read_mbytes ( 10, NAME_OF_DEV_URANDOM, nbuf, nbytes); @@ -369,7 +369,7 @@ int sh_entropy(int nbytes, char * nbuf) { /* -- Add previous entropy into the new pool. -- */ - memset(addbuf, '\0', sizeof(addbuf)); + memset(addbuf, 0, sizeof(addbuf)); for (i = 0; i < m_count; ++i) addbuf[i] = nbuf[i]; for (i = 0; i < KEY_BYT; ++i) @@ -377,7 +377,7 @@ int sh_entropy(int nbytes, char * nbuf) keybuf = (char *) sh_tiger_hash_uint32 (addbuf, TIGER_DATA, 2 * KEY_BYT, kbuf, KEY_BYT/sizeof(UINT32)); - memset(addbuf, '\0', sizeof(addbuf)); + memset(addbuf, 0, sizeof(addbuf)); /* -- Give out nbytes bytes from the new pool. -- */ @@ -389,8 +389,8 @@ int sh_entropy(int nbytes, char * nbuf) nbuf[i] = keybuf[i]; } SH_MUTEX_UNLOCK_UNSAFE(mutex_skey); - memset (keybuf, '\0', KEY_BYT); - memset (kbuf, '\0', sizeof(kbuf)); + memset (keybuf, 0, KEY_BYT); + memset (kbuf, 0, sizeof(kbuf)); SL_RETURN(0, _("sh_entropy")); } @@ -415,7 +415,7 @@ int sh_entropy(int nbytes, char * nbuf) #define FD_SETSIZE 32 #endif #ifndef FD_ZERO -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) +#define FD_ZERO(p) memset((char *)(p), 0, sizeof(*(p))) #endif #include "sh_static.h" @@ -952,7 +952,7 @@ int sh_entropy(int nbytes, char * nbuf) keybuf = (char *) sh_tiger_hash_uint32 ((char *) tseed, TIGER_DATA, sizeof(tseed), kbuf, KEY_BYT/sizeof(UINT32)); - memset(addbuf, '\0', sizeof(addbuf)); + memset(addbuf, 0, sizeof(addbuf)); for (i = 0; i < KEY_BYT; ++i) { addbuf[i] = keybuf[i]; @@ -973,7 +973,7 @@ int sh_entropy(int nbytes, char * nbuf) /* add previous entropy into the new pool */ - memset(addbuf, '\0', sizeof(addbuf)); + memset(addbuf, 0, sizeof(addbuf)); for (i = 0; i < KEY_BYT; ++i) { addbuf[i] = keybuf[i]; @@ -982,7 +982,7 @@ int sh_entropy(int nbytes, char * nbuf) keybuf = (char *) sh_tiger_hash_uint32 (addbuf, TIGER_DATA, sizeof(addbuf), kbuf, KEY_BYT/sizeof(UINT32)); - memset(addbuf, '\0', sizeof(addbuf)); + memset(addbuf, 0, sizeof(addbuf)); /* store in system pool */ @@ -991,8 +991,8 @@ int sh_entropy(int nbytes, char * nbuf) skey->poolv[i] = keybuf[i]; skey->poolc = KEY_BYT; SH_MUTEX_UNLOCK_UNSAFE(mutex_skey); - memset (buffer, '\0', BUF_ENT+2); - memset (keybuf, '\0', KEY_BYT); + memset (buffer, 0, BUF_ENT+2); + memset (keybuf, 0, KEY_BYT); SH_FREE(buffer); } else @@ -1029,13 +1029,13 @@ void Test_entropy (CuTest *tc) for (count = 0; count < 20; ++count) { - memset(skey->poolv, '\0', KEY_BYT); + memset(skey->poolv, 0, KEY_BYT); skey->poolc = 0; status = sh_entropy (24, bufx); CuAssertTrue(tc, 0 == status); - memset(skey->poolv, '\0', KEY_BYT); + memset(skey->poolv, 0, KEY_BYT); skey->poolc = 0; status = sh_entropy (24, bufy); |