X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilcrng.c;h=e9fe1c81ffe3d596b1572aeafa355104f388a2dc;hb=017dec75a98209fbef49eb496c2269b0c49e736d;hp=e6af9540a803cd2800fddf73f51d43019ae72f70;hpb=ef391ef4209fbfce60a77109d3930bc49f3cdc71;p=silc.git diff --git a/lib/silccrypt/silcrng.c b/lib/silccrypt/silcrng.c index e6af9540..e9fe1c81 100644 --- a/lib/silccrypt/silcrng.c +++ b/lib/silccrypt/silcrng.c @@ -203,8 +203,8 @@ static void silc_rng_get_soft_noise(SilcRng rng) #ifdef HAVE_GETPID silc_rng_xor(rng, getpid(), 1); #ifdef HAVE_GETPGID - silc_rng_xor(rng, getpgid(getpid() << 8), 2); - silc_rng_xor(rng, getpgid(getpid() << 8), 3); + silc_rng_xor(rng, getpgid(getpid()) << 8, 2); + silc_rng_xor(rng, getpgid(getpid()) << 8, 3); #endif silc_rng_xor(rng, getgid(), 4); #endif @@ -212,7 +212,7 @@ static void silc_rng_get_soft_noise(SilcRng rng) silc_rng_xor(rng, getpgrp(), 5); #endif #ifdef HAVE_GETSID - silc_rng_xor(rng, getsid(getpid() << 16), 6); + silc_rng_xor(rng, getsid(getpid()) << 16, 6); #endif silc_rng_xor(rng, times(&ptime), 7); silc_rng_xor(rng, ptime.tms_utime, 8); @@ -229,13 +229,13 @@ static void silc_rng_get_soft_noise(SilcRng rng) silc_rng_xor(rng, clock() << 4, pos++); #ifndef SILC_WIN32 #ifdef HAVE_GETPGID - silc_rng_xor(rng, getpgid(getpid() << 8), pos++); + silc_rng_xor(rng, getpgid(getpid()) << 8, pos++); #endif #ifdef HAVE_GETPGRP silc_rng_xor(rng, getpgrp(), pos++); #endif #ifdef HAVE_SETSID - silc_rng_xor(rng, getsid(getpid() << 16), pos++); + silc_rng_xor(rng, getsid(getpid()) << 16, pos++); #endif silc_rng_xor(rng, times(&ptime), pos++); silc_rng_xor(rng, ptime.tms_utime, pos++); @@ -303,6 +303,7 @@ static void silc_rng_get_hard_noise(SilcRng rng) static void silc_rng_exec_command(SilcRng rng, char *command) { +#ifndef SILC_WIN32 char buf[1024]; FILE *fd; int i; @@ -329,6 +330,7 @@ static void silc_rng_exec_command(SilcRng rng, char *command) /* Add the buffer into random pool */ silc_rng_add_noise(rng, buf, strlen(buf)); memset(buf, 0, sizeof(buf)); +#endif } /* This function adds the contents of the buffer as noise into random