[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4db1df8e824733b6289dc86dcc78bfe325031969 (commit)
      from  5321333520b95a4f355916923af6c24dd10ed5dc (commit)


- Log -----------------------------------------------------------------
commit 4db1df8e824733b6289dc86dcc78bfe325031969
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Nov 21 10:37:18 2021 +0100

    DOC: Add a few previously documented functions
    
    d2i_X509_bio(), d2i_X509_fp(), i2d_X509_bio(), and i2d_X509_fp()
    were documented in OpenSSL 1.0.2.  In a grand unification of the
    documentation of (almost) all d2i and i2d functions, these were
    dropped, most likely by mistake.
    
    This simply adds them back.
    
    Fixes #17091
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17094)
    
    (cherry picked from commit 1aa96159b0711369de9bf45b20327414cdb6b991)

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

Summary of changes:
 doc/man3/d2i_X509.pod     | 4 ++++
 util/missingcrypto.txt    | 4 ----
 util/missingcrypto111.txt | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index 5de84a9244..2bb1522f05 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -154,6 +154,8 @@ d2i_TS_TST_INFO_bio,
 d2i_TS_TST_INFO_fp,
 d2i_USERNOTICE,
 d2i_X509,
+d2i_X509_bio,
+d2i_X509_fp,
 d2i_X509_ALGOR,
 d2i_X509_ALGORS,
 d2i_X509_ATTRIBUTE,
@@ -325,6 +327,8 @@ i2d_TS_TST_INFO_bio,
 i2d_TS_TST_INFO_fp,
 i2d_USERNOTICE,
 i2d_X509,
+i2d_X509_bio,
+i2d_X509_fp,
 i2d_X509_ALGOR,
 i2d_X509_ALGORS,
 i2d_X509_ATTRIBUTE,
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index f01b47162d..f883219f6c 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -1413,8 +1413,6 @@ b2i_PublicKey_bio(3)
 conf_ssl_get(3)
 conf_ssl_get_cmd(3)
 conf_ssl_name_find(3)
-d2i_X509_bio(3)
-d2i_X509_fp(3)
 err_free_strings_int(3)
 i2a_ACCESS_DESCRIPTION(3)
 i2a_ASN1_ENUMERATED(3)
@@ -1423,8 +1421,6 @@ i2a_ASN1_OBJECT(3)
 i2a_ASN1_STRING(3)
 i2b_PrivateKey_bio(3)
 i2b_PublicKey_bio(3)
-i2d_X509_bio(3)
-i2d_X509_fp(3)
 i2o_ECPublicKey(3)
 i2v_ASN1_BIT_STRING(3)
 i2v_GENERAL_NAME(3)
diff --git a/util/missingcrypto111.txt b/util/missingcrypto111.txt
index 76dde23a3d..0386701ad1 100644
--- a/util/missingcrypto111.txt
+++ b/util/missingcrypto111.txt
@@ -1713,8 +1713,6 @@ b2i_PublicKey_bio(3)
 conf_ssl_get(3)
 conf_ssl_get_cmd(3)
 conf_ssl_name_find(3)
-d2i_X509_bio(3)
-d2i_X509_fp(3)
 err_free_strings_int(3)
 i2a_ACCESS_DESCRIPTION(3)
 i2a_ASN1_ENUMERATED(3)
@@ -1726,8 +1724,6 @@ i2b_PrivateKey_bio(3)
 i2b_PublicKey_bio(3)
 i2d_PrivateKey_bio(3)
 i2d_PrivateKey_fp(3)
-i2d_X509_bio(3)
-i2d_X509_fp(3)
 i2o_ECPublicKey(3)
 i2s_ASN1_ENUMERATED(3)
 i2s_ASN1_ENUMERATED_TABLE(3)