• D
    Fix reseeding issues of the public RAND_DRBG · c16de9d8
    Dr. Matthias St. Pierre 提交于
    Reseeding is handled very differently by the classic RAND_METHOD API
    and the new RAND_DRBG api. These differences led to some problems when
    the new RAND_DRBG was made the default OpenSSL RNG. In particular,
    RAND_add() did not work as expected anymore. These issues are discussed
    on the thread '[openssl-dev] Plea for a new public OpenSSL RNG API'
    and in Pull Request #4328. This commit fixes the mentioned issues,
    introducing the following changes:
    
    - Replace the fixed size RAND_BYTES_BUFFER by a new RAND_POOL API which
      facilitates collecting entropy by the get_entropy() callback.
    - Don't use RAND_poll()/RAND_add() for collecting entropy from the
      get_entropy() callback anymore. Instead, replace RAND_poll() by
      RAND_POOL_acquire_entropy().
    - Add a new function rand_drbg_restart() which tries to get the DRBG
      in an instantiated state by all means, regardless of the current
      state (uninstantiated, error, ...) the DRBG is in. If the caller
      provides entropy or additional input, it will be used for reseeding.
    - Restore the original documented behaviour of RAND_add() and RAND_poll()
      (namely to reseed the DRBG immediately) by a new implementation based
      on rand_drbg_restart().
    - Add automatic error recovery from temporary failures of the entropy
      source to RAND_DRBG_generate() using the rand_drbg_restart() function.
    Reviewed-by: NPaul Dale <paul.dale@oracle.com>
    Reviewed-by: NKurt Roeckx <kurt@roeckx.be>
    Reviewed-by: NRich Salz <rsalz@openssl.org>
    Reviewed-by: NBen Kaduk <kaduk@mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/4328)
    c16de9d8
ssl_lib.c 140.1 KB