The branch master has been updated
via d2f82495a25d835e4821c0c1a79e8e39b66eed66 (commit)
from 57cea5baf616a4a435650d174bfb435578c770c5 (commit)
- Log -----------------------------------------------------------------
commit d2f82495a25d835e4821c0c1a79e8e39b66eed66
Author: Matt Caswell <m...@openssl.org>
Date: Tue May 18 17:39:56 2021 +0100
Cleanup the missing*.txt files
One macro existed that was added since 1.1.1 and was undocumented. This
had been added to missingmacro.txt. This is the wrong approach and so
has been removed from there.
There were some entries in missingcrypto.txt that don't exist as functions
at all. There were also some which were in fact documented.
Additionally 2 entries from missingcrypto.txt have been moved to
missingmacro.txt. These entries existed in 1.1.1 and were undocumented. In
master they have been deprecated and compatibility macros for them
implemented. The replacement functions have been documented.
An entry in missingcrypto111.txt was not in alphabetical order (and was
also) duplicated, but the equivalent entry in missingcrypto.txt was in the
correct place. This has been corrected to make comparisons between the files
easier.
Finally a function has been added to missingcrypto111.txt. This function
did exist in 1.1.1 and was undocumented. Its unclear why this wasn't in
missingcrypto111.txt to start with.
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15333)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/OSSL_CORE_MAKE_FUNC.pod | 4 +++-
doc/man3/X509_LOOKUP_hash_dir.pod | 1 -
doc/man3/X509_check_host.pod | 3 +--
doc/man7/EVP_KDF-KRB5KDF.pod | 1 -
util/missingcrypto.txt | 15 ---------------
util/missingcrypto111.txt | 4 ++--
util/missingmacro.txt | 3 ++-
util/other.syms | 1 +
8 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/doc/man3/OSSL_CORE_MAKE_FUNC.pod b/doc/man3/OSSL_CORE_MAKE_FUNC.pod
index 751a01fc57..a7a902a336 100644
--- a/doc/man3/OSSL_CORE_MAKE_FUNC.pod
+++ b/doc/man3/OSSL_CORE_MAKE_FUNC.pod
@@ -3,7 +3,8 @@
=head1 NAME
OSSL_CORE_MAKE_FUNC,
-SSL_OP_BIT
+SSL_OP_BIT,
+EXT_UTF8STRING
- OpenSSL reserved symbols
=head1 SYNOPSIS
@@ -12,6 +13,7 @@ SSL_OP_BIT
#define OSSL_CORE_MAKE_FUNC(type,name,args)
#define SSL_OP_BIT(n)
+ #define EXT_UTF8STRING(nid)
=head1 DESCRIPTION
diff --git a/doc/man3/X509_LOOKUP_hash_dir.pod
b/doc/man3/X509_LOOKUP_hash_dir.pod
index 9212228828..22a5996925 100644
--- a/doc/man3/X509_LOOKUP_hash_dir.pod
+++ b/doc/man3/X509_LOOKUP_hash_dir.pod
@@ -142,7 +142,6 @@ the number of loaded objects or 0 on error.
L<PEM_read_PrivateKey(3)>,
L<X509_STORE_load_locations(3)>,
-L<X509_store_add_lookup(3)>,
L<SSL_CTX_load_verify_locations(3)>,
L<X509_LOOKUP_meth_new(3)>,
L<ossl_store(7)>
diff --git a/doc/man3/X509_check_host.pod b/doc/man3/X509_check_host.pod
index 23476a81df..3a9f616f48 100644
--- a/doc/man3/X509_check_host.pod
+++ b/doc/man3/X509_check_host.pod
@@ -145,8 +145,7 @@ L<SSL_get_verify_result(3)>,
L<X509_VERIFY_PARAM_set1_host(3)>,
L<X509_VERIFY_PARAM_add1_host(3)>,
L<X509_VERIFY_PARAM_set1_email(3)>,
-L<X509_VERIFY_PARAM_set1_ip(3)>,
-L<X509_VERIFY_PARAM_set1_ipasc(3)>
+L<X509_VERIFY_PARAM_set1_ip(3)>
=head1 HISTORY
diff --git a/doc/man7/EVP_KDF-KRB5KDF.pod b/doc/man7/EVP_KDF-KRB5KDF.pod
index b239f4ed30..1d71aca17b 100644
--- a/doc/man7/EVP_KDF-KRB5KDF.pod
+++ b/doc/man7/EVP_KDF-KRB5KDF.pod
@@ -94,7 +94,6 @@ RFC 3961
L<EVP_KDF(3)>,
L<EVP_KDF_CTX_free(3)>,
-L<EVP_KDF_ctrl(3)>,
L<EVP_KDF_CTX_get_kdf_size(3)>,
L<EVP_KDF_derive(3)>,
L<EVP_KDF(3)/PARAMETERS>
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 0946be28a0..00083c834d 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -505,7 +505,6 @@ ECPARAMETERS_it(3)
ECPKPARAMETERS_it(3)
ECParameters_print(3)
ECParameters_print_fp(3)
-EC_GROUP_get_field_type(3)
EC_GROUP_get_mont_data(3)
EC_KEY_METHOD_free(3)
EC_KEY_METHOD_get_compute_key(3)
@@ -590,7 +589,6 @@ EVP_KEYMGMT-DSA(7)
EVP_KEYMGMT-RSA(7)
EVP_KEYMGMT-X25519(7)
EVP_KEYMGMT-X448(7)
-EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(3)
EVP_SIGNATURE-DSA(7)
EVP_SIGNATURE-ECDSA(7)
EVP_SIGNATURE-ED25519(7)
@@ -602,7 +600,6 @@ ERR_load_ASYNC_strings(3)
ERR_load_BIO_strings(3)
ERR_load_BN_strings(3)
ERR_load_BUF_strings(3)
-ERR_load_CMP_strings(3)
ERR_load_CMS_strings(3)
ERR_load_COMP_strings(3)
ERR_load_CONF_strings(3)
@@ -646,7 +643,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_KDF_ctrl(3)
EVP_MD_do_all(3)
EVP_MD_do_all_sorted(3)
EVP_PBE_alg_add(3)
@@ -678,11 +674,9 @@ EVP_add_alg_module(3)
EVP_add_cipher(3)
EVP_add_digest(3)
EVP_get_pw_prompt(3)
-EVP_hex2ctrl(3)
EVP_read_pw_string(3)
EVP_read_pw_string_min(3)
EVP_set_pw_prompt(3)
-EVP_str2ctrl(3)
EXTENDED_KEY_USAGE_it(3)
GENERAL_NAMES_it(3)
GENERAL_NAME_cmp(3)
@@ -776,10 +770,6 @@ OCSP_ONEREQ_get_ext_by_critical(3)
OCSP_ONEREQ_get_ext_count(3)
OCSP_ONEREQ_it(3)
OCSP_REQINFO_it(3)
-OCSP_REQ_CTX_get0_mem_bio(3)
-OCSP_REQ_CTX_http(3)
-OCSP_REQ_CTX_new(3)
-OCSP_REQ_CTX_nbio(3)
OCSP_REQUEST_add1_ext_i2d(3)
OCSP_REQUEST_add_ext(3)
OCSP_REQUEST_delete_ext(3)
@@ -842,9 +832,6 @@ OPENSSL_strnlen(3)
OPENSSL_uni2asc(3)
OPENSSL_uni2utf8(3)
OPENSSL_utf82uni(3)
-OSSL_CRMF_CERTID_dup(3)
-OSSL_PARAM_modified(3)
-OSSL_PARAM_set_all_unmodified(3)
OSSL_ENCODER-DH(7)
OSSL_ENCODER-DSA(7)
OSSL_ENCODER-EC(7)
@@ -1329,7 +1316,6 @@ X509_VERIFY_PARAM_lookup(3)
X509_VERIFY_PARAM_move_peername(3)
X509_VERIFY_PARAM_new(3)
X509_VERIFY_PARAM_set1(3)
-X509_VERIFY_PARAM_set1_ipasc(3)
X509_VERIFY_PARAM_set1_name(3)
X509_VERIFY_PARAM_table_cleanup(3)
X509_add1_reject_object(3)
@@ -1383,7 +1369,6 @@ X509_print_fp(3)
X509_reject_clear(3)
X509_signature_dump(3)
X509_signature_print(3)
-X509_store_add_lookup(3)
X509_subject_name_hash(3)
X509_subject_name_hash_old(3)
X509_supported_extension(3)
diff --git a/util/missingcrypto111.txt b/util/missingcrypto111.txt
index 4be52cf25c..76dde23a3d 100644
--- a/util/missingcrypto111.txt
+++ b/util/missingcrypto111.txt
@@ -28,8 +28,6 @@ ASIdentifierChoice_it(3)
ASIdentifierChoice_it(3)
ASIdentifiers_it(3)
ASIdentifiers_it(3)
-ASRange_it(3)
-ASRange_it(3)
ASN1_ANY_it(3)
ASN1_BIT_STRING_check(3)
ASN1_BIT_STRING_free(3)
@@ -182,6 +180,7 @@ ASN1_sign(3)
ASN1_str2mask(3)
ASN1_tag2bit(3)
ASN1_verify(3)
+ASRange_it(3)
AUTHORITY_INFO_ACCESS_it(3)
AUTHORITY_INFO_ACCESS_it(3)
AUTHORITY_KEYID_it(3)
@@ -1232,6 +1231,7 @@ SRP_create_verifier(3)
SRP_create_verifier_BN(3)
SRP_get_default_gN(3)
SRP_user_pwd_free(3)
+SSL_CTX_set0_ctlog_store(3)
SXNETID_it(3)
SXNETID_it(3)
SXNET_add_id_INTEGER(3)
diff --git a/util/missingmacro.txt b/util/missingmacro.txt
index 6b7f9fa2b3..97d22205af 100644
--- a/util/missingmacro.txt
+++ b/util/missingmacro.txt
@@ -93,6 +93,8 @@ int_implement_lhash_doall(3)
OBJ_create_and_add_object(3)
OBJ_bsearch(3)
OBJ_bsearch_ex(3)
+OCSP_REQ_CTX_http(3)
+OCSP_REQ_CTX_new(3)
PEM_read_bio_OCSP_REQUEST(3)
PEM_read_bio_OCSP_RESPONSE(3)
PEM_write_bio_OCSP_REQUEST(3)
@@ -172,4 +174,3 @@ X509V3_set_ctx_test(3)
X509V3_set_ctx_nodb(3)
EXT_BITSTRING(3)
EXT_IA5STRING(3)
-EXT_UTF8STRING(3)
diff --git a/util/other.syms b/util/other.syms
index 466373ad7f..706ad7f5da 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -333,6 +333,7 @@ EVP_rc5_32_12_16_cfb define
EVP_RSA_gen define
EVP_seed_cfb define
EVP_sm4_cfb define
+EXT_UTF8STRING define
OBJ_cleanup define deprecated 1.1.0
OCSP_parse_url define
OCSP_REQ_CTX datatype deprecated 3.0.0
