[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bd9faf117db1e53b2ad2ee9cbfe8def8c98ecb7b (commit)
      from  03e5668343078b963cc6544ad7270743de13e514 (commit)


- Log -----------------------------------------------------------------
commit bd9faf117db1e53b2ad2ee9cbfe8def8c98ecb7b
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 9 02:41:26 2019 +0200

    Do no mention private headers in public headers
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/9812)

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

Summary of changes:
 include/openssl/bio.h   | 2 +-
 include/openssl/ct.h    | 2 --
 include/openssl/dtls1.h | 2 +-
 include/openssl/evp.h   | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 2312ca647c..3e4fbd35b0 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -142,7 +142,7 @@ extern "C" {
 # define BIO_CTRL_DGRAM_SET_PEEK_MODE      71
 
 /*
- * internal BIO see include/internal/bio.h:
+ * internal BIO:
  * # define BIO_CTRL_SET_KTLS_SEND                 72
  * # define BIO_CTRL_SET_KTLS_SEND_CTRL_MSG        74
  * # define BIO_CTRL_CLEAR_KTLS_CTRL_MSG           75
diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 334e1aff55..76f566304e 100644
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h
@@ -463,8 +463,6 @@ __owur int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file);
 
 /*
  * Loads the default CT log list into a |store|.
- * See internal/cryptlib.h for the environment variable and file path that are
- * consulted to find the default file.
  * Returns 1 if loading is successful, or 0 otherwise.
  */
 __owur int CTLOG_STORE_load_default_file(CTLOG_STORE *store);
diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h
index f717afbe51..ef01d8b9db 100644
--- a/include/openssl/dtls1.h
+++ b/include/openssl/dtls1.h
@@ -47,7 +47,7 @@ extern "C" {
 
 # define DTLS1_AL_HEADER_LENGTH                   2
 
-/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
+/* Timeout multipliers */
 # define DTLS1_TMO_READ_COUNT                      2
 # define DTLS1_TMO_WRITE_COUNT                     2
 
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index a0733b9697..d1bd0b69d0 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -186,7 +186,7 @@ int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
  * if the following flag is set.
  */
 # define EVP_MD_CTX_FLAG_FINALISE        0x0200
-/* NOTE: 0x0400 is reserved for internal usage in evp_int.h */
+/* NOTE: 0x0400 is reserved for internal usage */
 
 EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len);
 EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher);