Commit 1d365364 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Matt Caswell
Browse files

Fix a strict warnings error in rand_pool_acquire_entropy 



There was a warning about unused variables in this config:
./config --strict-warnings --with-rand-seed=rdcpu

Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9687)

(cherry picked from commit e301c147a763f67dcc5ba63eb7e2ae40d83a68aa)
parent 63180182

crypto/rand/rand_unix.c

+22 −17
Original line number Original line Diff line number Diff line
@@ -573,12 +573,12 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) 
#  if defined(OPENSSL_RAND_SEED_NONE)

#  if defined(OPENSSL_RAND_SEED_NONE)

    return rand_pool_entropy_available(pool);

    return rand_pool_entropy_available(pool);

#  else

#  else

    size_t bytes_needed;

    size_t entropy_available;

    size_t entropy_available = 0;

    unsigned char *buffer;





#   if defined(OPENSSL_RAND_SEED_GETRANDOM)

#   if defined(OPENSSL_RAND_SEED_GETRANDOM)

    {

    {

        size_t bytes_needed;

        unsigned char *buffer;

        ssize_t bytes;

        ssize_t bytes;

        /* Maximum allowed number of consecutive unsuccessful attempts */

        /* Maximum allowed number of consecutive unsuccessful attempts */

        int attempts = 3;

        int attempts = 3;
@@ -609,6 +609,8 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) 




#   if defined(OPENSSL_RAND_SEED_DEVRANDOM)

#   if defined(OPENSSL_RAND_SEED_DEVRANDOM)

    if (wait_random_seeded()) {

    if (wait_random_seeded()) {

        size_t bytes_needed;

        unsigned char *buffer;

        size_t i;

        size_t i;





        bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);

        bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
@@ -658,27 +660,30 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) 
#   endif

#   endif





#   if defined(OPENSSL_RAND_SEED_EGD)

#   if defined(OPENSSL_RAND_SEED_EGD)

    bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);

    {

    if (bytes_needed > 0) {

        static const char *paths[] = { DEVRANDOM_EGD, NULL };

        static const char *paths[] = { DEVRANDOM_EGD, NULL };

        size_t bytes_needed;

        unsigned char *buffer;

        int i;

        int i;





        for (i = 0; paths[i] != NULL; i++) {

        bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);

            buffer = rand_pool_add_begin(pool, bytes_needed);

        for (i = 0; bytes_needed > 0 && paths[i] != NULL; i++) {

            if (buffer != NULL) {

            size_t bytes = 0;

            size_t bytes = 0;

                int num = RAND_query_egd_bytes(paths[i],

            int num;



            buffer = rand_pool_add_begin(pool, bytes_needed);

            num = RAND_query_egd_bytes(paths[i],

                                       buffer, (int)bytes_needed);

                                       buffer, (int)bytes_needed);

            if (num == (int)bytes_needed)

            if (num == (int)bytes_needed)

                bytes = bytes_needed;

                bytes = bytes_needed;





            rand_pool_add_end(pool, bytes, 8 * bytes);

            rand_pool_add_end(pool, bytes, 8 * bytes);

                entropy_available = rand_pool_entropy_available(pool);

            bytes_needed = rand_pool_bytes_needed(pool, 1);

        }

        }

        entropy_available = rand_pool_entropy_available(pool);

        if (entropy_available > 0)

        if (entropy_available > 0)

            return entropy_available;

            return entropy_available;

    }

    }

    }

#   endif

#   endif





    return rand_pool_entropy_available(pool);

    return rand_pool_entropy_available(pool);