[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  ae3254287ff87e484c7fd8f757cad1440ee8f5ff (commit)
      from  fbc6efbbc16fc1410f776431395ea2b2ad691d4c (commit)


- Log -----------------------------------------------------------------
commit ae3254287ff87e484c7fd8f757cad1440ee8f5ff
Author: Jim Newsome <jnewsome at torproject.org>
Date:   Tue Apr 7 16:29:53 2020 -0500

    Update RAND_METHOD definition in man page
    
    The `add` and `seed` callbacks were changed to return `int` instead of
    `void` in b6dcdbfc94c482f6c15ba725754fc9e827e41851 (first included in
    tag OpenSSL_1_1_0-pre1).
    
    The `add` callback was changed to take a `double` instead of an `int`
    in 853f757ecea74a271a7c5cdee3f3b5fe0d3ae863.
    
    CLA: trivial
    Fixes: #10199
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11486)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/RAND_set_rand_method.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man3/RAND_set_rand_method.pod b/doc/man3/RAND_set_rand_method.pod
index 0966b091bb..d9e213256e 100644
--- a/doc/man3/RAND_set_rand_method.pod
+++ b/doc/man3/RAND_set_rand_method.pod
@@ -33,10 +33,10 @@ RAND_get_rand_method() returns a pointer to the current B<RAND_METHOD>.
 =head1 THE RAND_METHOD STRUCTURE
 
  typedef struct rand_meth_st {
-     void (*seed)(const void *buf, int num);
+     int (*seed)(const void *buf, int num);
      int (*bytes)(unsigned char *buf, int num);
      void (*cleanup)(void);
-     void (*add)(const void *buf, int num, int randomness);
+     int (*add)(const void *buf, int num, double entropy);
      int (*pseudorand)(unsigned char *buf, int num);
      int (*status)(void);
  } RAND_METHOD;