[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b2b90922c2cfdfaa6a6f3588a014c74ff445508a (commit)
       via  17fa385d2cd4443707aa42ab752a00aacf87d750 (commit)
      from  3e73f558af600ea068bb2132988c31ddb444e13e (commit)


- Log -----------------------------------------------------------------
commit b2b90922c2cfdfaa6a6f3588a014c74ff445508a
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 23 18:43:26 2019 +0100

    Removed now documented stuff from util/missing*.txt
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10683)

commit 17fa385d2cd4443707aa42ab752a00aacf87d750
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Dec 22 23:52:30 2019 +0100

    util/find-doc-nits: when loading "missing" files, check if documented
    
    It may be that some "missing" manuals have been written since their
    insertion in the "missing" files.  Make sure to alert when such manual
    references are found.
    
    This works, because we collect all existing manual references into
    %name_map first.
    
    Fixes #10681
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10683)

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

Summary of changes:
 util/find-doc-nits     |  5 +++++
 util/missingcrypto.txt |  3 ---
 util/missingmacro.txt  | 27 ---------------------------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 93cdf03bb7..4b6d7c5e61 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -600,6 +600,11 @@ sub loadmissing($)
     }
     close FH;
 
+    for (@missing) {
+        err("$missingfile:", "$_ is documented in $name_map{$_}")
+            if exists $name_map{$_} && defined $name_map{$_};
+    }
+
     return @missing;
 }
 
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 7e540058ad..cf6824d49e 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -479,7 +479,6 @@ EVP_CIPHER_do_all_sorted(3)
 EVP_CIPHER_get_asn1_iv(3)
 EVP_CIPHER_impl_ctx_size(3)
 EVP_CIPHER_set_asn1_iv(3)
-EVP_Cipher(3)
 EVP_MD_do_all(3)
 EVP_MD_do_all_sorted(3)
 EVP_PBE_CipherInit(3)
@@ -753,9 +752,7 @@ PEM_def_callback(3)
 PEM_dek_info(3)
 PEM_proc_type(3)
 PEM_read_bio_ECPrivateKey(3)
-PEM_read_bio_Parameters(3)
 PEM_write_bio_ASN1_stream(3)
-PEM_write_bio_Parameters(3)
 PKCS12_AUTHSAFES_it(3)
 PKCS12_BAGS_it(3)
 PKCS12_MAC_DATA_it(3)
diff --git a/util/missingmacro.txt b/util/missingmacro.txt
index 6367482057..3d825b199d 100644
--- a/util/missingmacro.txt
+++ b/util/missingmacro.txt
@@ -70,8 +70,6 @@ ENGINE_load_afalg(3)
 ENGINE_load_cryptodev(3)
 ENGINE_load_rdrand(3)
 EVP_MD_nid(3)
-EVP_MD_name(3)
-EVP_CIPHER_name(3)
 EVP_ENCODE_LENGTH(3)
 EVP_DECODE_LENGTH(3)
 BIO_set_md_ctx(3)
@@ -102,19 +100,7 @@ PEM_write_bio_OCSP_RESPONSE(3)
 ASN1_BIT_STRING_digest(3)
 OCSP_CERTSTATUS_dup(3)
 OPENSSL_VERSION_PREREQ(3)
-OPENSSL_MSTR_HELPER(3)
-OPENSSL_MSTR(3)
 OSSL_PARAM_DEFN(3)
-OSSL_PARAM_int(3)
-OSSL_PARAM_uint(3)
-OSSL_PARAM_long(3)
-OSSL_PARAM_ulong(3)
-OSSL_PARAM_int32(3)
-OSSL_PARAM_uint32(3)
-OSSL_PARAM_int64(3)
-OSSL_PARAM_uint64(3)
-OSSL_PARAM_size_t(3)
-OSSL_PARAM_double(3)
 OSSL_PARAM_SIZED_int(3)
 OSSL_PARAM_SIZED_uint(3)
 OSSL_PARAM_SIZED_long(3)
@@ -165,9 +151,6 @@ SSL_need_tmp_RSA(3)
 SSL_set_tmp_rsa(3)
 SSL_CTX_set_tmp_rsa_callback(3)
 SSL_set_tmp_rsa_callback(3)
-SSL_get_ex_new_index(3)
-SSL_SESSION_get_ex_new_index(3)
-SSL_CTX_get_ex_new_index(3)
 SSL_CTX_set_default_read_ahead(3)
 SSL_cache_hit(3)
 TLS1_get_version(3)
@@ -180,16 +163,6 @@ SSL_get_tlsext_status_ids(3)
 SSL_set_tlsext_status_ids(3)
 SSL_CTX_get_tlsext_ticket_keys(3)
 SSL_CTX_set_tlsext_ticket_keys(3)
-OSSL_TRACE_CANCEL(3)
-OSSL_TRACE_ENABLED(3)
-OSSL_TRACEV(3)
-OSSL_TRACE(3)
-OSSL_TRACE3(3)
-OSSL_TRACE4(3)
-OSSL_TRACE5(3)
-OSSL_TRACE6(3)
-OSSL_TRACE7(3)
-OSSL_TRACE8(3)
 X509_extract_key(3)
 X509_REQ_extract_key(3)
 X509_name_cmp(3)