[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  b9499cf8de17d1d7efd4ad135beb74d5dec8e120 (commit)
       via  a497a088134dd02b1d3f053ba9a63fdd6cf8e9b4 (commit)
      from  5900679b889246a0abcec67e1812673e3f570bde (commit)


- Log -----------------------------------------------------------------
commit b9499cf8de17d1d7efd4ad135beb74d5dec8e120
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 21 13:12:15 2018 +0100

    include/openssl/rand.h: omit intermediate typedef.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4159)

commit a497a088134dd02b1d3f053ba9a63fdd6cf8e9b4
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Aug 14 21:38:23 2017 +0200

    openssl/rand.h: fix formatting.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4159)

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

Summary of changes:
 include/openssl/rand.h | 3 ---
 util/private.num       | 1 -
 2 files changed, 4 deletions(-)

diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index 40e67c5..058ece6 100644
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -48,7 +48,6 @@ void RAND_seed(const void *buf, int num);
 # if defined(__ANDROID__) && defined(__NDK_FPABI__)
 __NDK_FPABI__	/* __attribute__((pcs("aapcs"))) on ARM */
 # endif
-
 void RAND_add(const void *buf, int num, double randomness);
 int RAND_load_file(const char *file, long max_bytes);
 int RAND_write_file(const char *file);
@@ -61,8 +60,6 @@ int RAND_egd(const char *path);
 int RAND_egd_bytes(const char *path, int bytes);
 # endif
 
-typedef void (*RAND_poll_cb)(void *arg,
-                             const void *buf, int num, double randomness);
 int RAND_poll(void);
 
 # if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
diff --git a/util/private.num b/util/private.num
index dea5cc2..7c008f3 100644
--- a/util/private.num
+++ b/util/private.num
@@ -43,7 +43,6 @@ OSSL_STORE_open_fn                      datatype
 OSSL_STORE_post_process_info_fn         datatype
 PROFESSION_INFO                         datatype
 PROFESSION_INFOS                        datatype
-RAND_poll_cb                            datatype
 SSL_CTX_keylog_cb_func                  datatype
 SSL_client_hello_cb_fn                  datatype
 SSL_psk_client_cb_func                  datatype