Commit 72c0e420 authored by Robert David Graham's avatar Robert David Graham
Browse files

Merge pull request #72 from kicdu/fix/entropy 

Small change for better seed and randomness.
parents 58736df1 a0d30f5f

src/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ int main(int argc, char *argv[]) 
     * Initialize those defaults that aren't zero

     */

    memset(masscan, 0, sizeof(*masscan));

    masscan->seed = time(0); /* a predictable, but 'random' seed */

    masscan->seed = get_entropy(); /* entropy for randomness */

    masscan->wait = 10; /* how long to wait for responses when done */

    masscan->max_rate = 100.0; /* max rate = hundred packets-per-second */

    masscan->nic_count = 1;

src/syn-cookie.c

+1 −9
Original line number Diff line number Diff line
@@ -15,19 +15,11 @@ 
 * NOTE: Mostly it's here to amuse cryptographers with its lulz.

 ***************************************************************************/

uint64_t

syn_get_entropy(uint64_t seed)

get_entropy(void)

{

    uint64_t entropy[2] = {0,0};

    unsigned i;



    /*

     * If we have a manual seed, use that instead

     */

    if (seed) {

        entropy[0] = seed;

        return seed;

    }



    /*

     * Gather some random bits

     */

src/syn-cookie.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ syn_cookie( unsigned ip_dst, unsigned port_dst, 
/**

 * Called on startup to set a secret key

 */

uint64_t syn_get_entropy(uint64_t seed);

uint64_t get_entropy(void);





#endif