diff options
author | Rich Salz <rsalz@akamai.com> | 2019-10-24 16:40:11 -0400 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-01-22 18:06:49 +0100 |
commit | fadb57e554cb0b9b7678902a3572740f31bcc279 (patch) | |
tree | 9f46c05cf0fd4f5fa18c8204c0a9607eb4314b5a /util | |
parent | 2280685883f7c19a07a55bcc3ddcd11b6cd82056 (diff) |
Fix some missing doc links.
Replace "=for openssl foreign manuals" with simpler syntax, it looks
like the "=for openssl ifdef" construct.
Fix some broken L<> links; add some missing foreign references and fixed
some typo's.
The WARNINGS in dhparam referred to non-existant commands so reword it.
Fixes #10109
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10256)
Diffstat (limited to 'util')
-rwxr-xr-x | util/find-doc-nits | 35 | ||||
-rw-r--r-- | util/libcrypto.num | 8 | ||||
-rw-r--r-- | util/missingcrypto.txt | 17 | ||||
-rw-r--r-- | util/other.syms | 2 |
4 files changed, 34 insertions, 28 deletions
diff --git a/util/find-doc-nits b/util/find-doc-nits index 773214c94d..3daf58182f 100755 --- a/util/find-doc-nits +++ b/util/find-doc-nits @@ -597,7 +597,7 @@ sub loadmissing($) my @missing; open FH, $missingfile - || die "Can't open $missingfile"; + or die "Can't open $missingfile"; while ( <FH> ) { chomp; next if /^#/; @@ -631,7 +631,8 @@ sub checkmacros { next if $f eq 'include/openssl/asn1.h'; next if $f eq 'include/openssl/asn1t.h'; next if $f eq 'include/openssl/err.h'; - open(IN, $f) || die "Can't open $f, $!"; + open(IN, $f) + or die "Can't open $f, $!"; while ( <IN> ) { next unless /^#\s*define\s*(\S+)\(/; my $macro = "$1(3)"; # We know they're all in section 3 @@ -666,7 +667,7 @@ sub printem { my $count = 0; my %seen; - my @missing = loadmissing($missingfile) if ( $opt_v ); + my @missing = loadmissing($missingfile) if $opt_v; foreach my $func ( parsenum($numfile) ) { $func .= '(3)'; # We know they're all in section 3 @@ -700,7 +701,7 @@ sub collectnames { err($id, "$simplename not in NAME section"); push @{$podinfo{names}}, $simplename; } - foreach my $name (@{$podinfo{names}}) { + foreach my $name ( @{$podinfo{names}} ) { next if $name eq ""; err($id, "'$name' contains white space") if $name =~ /\s/; @@ -716,11 +717,10 @@ sub collectnames { } } - my @foreign_names = - map { map { s/\s+//g; $_ } split(/,/, $_) } - $podinfo{contents} =~ /=for\s+openssl\s+foreign\s+manuals:\s*(.*)\n\n/; - foreach ( @foreign_names ) { - $name_map{$_} = undef; # It still exists! + if ( $podinfo{contents} =~ /=for openssl foreign manual (.*)\n/ ) { + foreach my $f ( split / /, $1 ) { + $name_map{$f} = undef; # It still exists! + } } my @links = @@ -738,8 +738,8 @@ sub collectnames { # Look for L<> ("link") references that point to files that do not exist. sub checklinks { - foreach my $filename (sort keys %link_map) { - foreach my $link (@{$link_map{$filename}}) { + foreach my $filename ( sort keys %link_map ) { + foreach my $link ( @{$link_map{$filename}} ) { err("${filename}:1:", "reference to non-existing $link") unless exists $name_map{$link}; } @@ -788,7 +788,7 @@ sub checkflags { # Get the list of options in the command. open CFH, "./apps/openssl list --options $cmd|" - || die "Can list options for $cmd, $!"; + or die "Can list options for $cmd, $!"; while ( <CFH> ) { chop; s/ .$//; @@ -798,7 +798,7 @@ sub checkflags { # Get the list of flags from the synopsis open CFH, "<$doc" - || die "Can't open $doc, $!"; + or die "Can't open $doc, $!"; while ( <CFH> ) { chop; last if /DESCRIPTION/; @@ -842,7 +842,7 @@ if ( $opt_c ) { # Get list of commands. open FH, "./apps/openssl list -1 -commands|" - || die "Can't list commands, $!"; + or die "Can't list commands, $!"; while ( <FH> ) { chop; push @commands, $_; @@ -863,7 +863,7 @@ if ( $opt_c ) { # See what help is missing. open FH, "./apps/openssl list --missing-help |" - || die "Can't list missing help, $!"; + or die "Can't list missing help, $!"; while ( <FH> ) { chop; my ($cmd, $flag) = split; @@ -882,6 +882,9 @@ if ( $opt_l || $opt_u || $opt_v ) { } if ( $opt_l ) { + foreach my $func ( loadmissing("util/missingcrypto.txt") ) { + $name_map{$func} = undef; + } checklinks(); } @@ -893,7 +896,7 @@ if ( $opt_n ) { # If not given args, check that all man1 commands are named properly. if ( scalar @ARGV == 0 ) { - foreach (glob('doc/man1/*.pod')) { + foreach ( glob('doc/man1/*.pod') ) { next if /CA.pl/ || /openssl\.pod/ || /tsget\.pod/; err("$_ doesn't start with openssl-") unless /openssl-/; } diff --git a/util/libcrypto.num b/util/libcrypto.num index ce01244621..457f968889 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4426,7 +4426,6 @@ EVP_MD_CTX_set_pkey_ctx 4531 3_0_0 EXIST::FUNCTION: EVP_PKEY_meth_set_digest_custom 4532 3_0_0 EXIST::FUNCTION: EVP_PKEY_meth_get_digest_custom 4533 3_0_0 EXIST::FUNCTION: EVP_MAC_CTX_new ? 3_0_0 EXIST::FUNCTION: -EVP_MAC_CTX_new_id ? 3_0_0 NOEXIST::FUNCTION: EVP_MAC_CTX_free ? 3_0_0 EXIST::FUNCTION: EVP_MAC_CTX_dup ? 3_0_0 EXIST::FUNCTION: EVP_MAC_CTX_mac ? 3_0_0 EXIST::FUNCTION: @@ -4658,7 +4657,6 @@ BN_priv_rand_ex ? 3_0_0 EXIST::FUNCTION: BN_rand_range_ex ? 3_0_0 EXIST::FUNCTION: BN_priv_rand_range_ex ? 3_0_0 EXIST::FUNCTION: BN_generate_prime_ex2 ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_derive_init_ex ? 3_0_0 NOEXIST::FUNCTION: EVP_KEYEXCH_free ? 3_0_0 EXIST::FUNCTION: EVP_KEYEXCH_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_KEYEXCH_fetch ? 3_0_0 EXIST::FUNCTION: @@ -4669,7 +4667,6 @@ EVP_KEYMGMT_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_KEYMGMT_free ? 3_0_0 EXIST::FUNCTION: EVP_KEYMGMT_provider ? 3_0_0 EXIST::FUNCTION: X509_PUBKEY_dup ? 3_0_0 EXIST::FUNCTION: -ERR_put_func_error ? 3_0_0 NOEXIST::FUNCTION: EVP_MD_name ? 3_0_0 EXIST::FUNCTION: EVP_CIPHER_name ? 3_0_0 EXIST::FUNCTION: EVP_MD_provider ? 3_0_0 EXIST::FUNCTION: @@ -4710,7 +4707,6 @@ EVP_MAC_CTX_get_params ? 3_0_0 EXIST::FUNCTION: EVP_MAC_gettable_ctx_params ? 3_0_0 EXIST::FUNCTION: EVP_MAC_free ? 3_0_0 EXIST::FUNCTION: EVP_MAC_up_ref ? 3_0_0 EXIST::FUNCTION: -EVP_MAC_name ? 3_0_0 NOEXIST::FUNCTION: EVP_MAC_get_params ? 3_0_0 EXIST::FUNCTION: EVP_MAC_gettable_params ? 3_0_0 EXIST::FUNCTION: EVP_MAC_provider ? 3_0_0 EXIST::FUNCTION: @@ -4721,7 +4717,6 @@ EVP_KDF_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_KDF_free ? 3_0_0 EXIST::FUNCTION: EVP_KDF_fetch ? 3_0_0 EXIST::FUNCTION: EVP_KDF_CTX_dup ? 3_0_0 EXIST::FUNCTION: -EVP_KDF_name ? 3_0_0 NOEXIST::FUNCTION: EVP_KDF_provider ? 3_0_0 EXIST::FUNCTION: EVP_KDF_get_params ? 3_0_0 EXIST::FUNCTION: EVP_KDF_CTX_get_params ? 3_0_0 EXIST::FUNCTION: @@ -4734,10 +4729,7 @@ EVP_SIGNATURE_free ? 3_0_0 EXIST::FUNCTION: EVP_SIGNATURE_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_SIGNATURE_provider ? 3_0_0 EXIST::FUNCTION: EVP_SIGNATURE_fetch ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_sign_init_ex ? 3_0_0 NOEXIST::FUNCTION: EVP_PKEY_CTX_set_signature_md ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_verify_init_ex ? 3_0_0 NOEXIST::FUNCTION: -EVP_PKEY_verify_recover_init_ex ? 3_0_0 NOEXIST::FUNCTION: EVP_PKEY_CTX_get_signature_md ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_get_params ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 954cfc4523..f1eea668cd 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -1,4 +1,3 @@ -# Missing functions in libcrypto, as of Tue Oct 1 16:13:38 EDT 2019 ACCESS_DESCRIPTION_it(3) ADMISSIONS_it(3) ADMISSION_SYNTAX_it(3) @@ -20,6 +19,8 @@ AES_wrap_key(3) ASIdOrRange_it(3) ASIdentifierChoice_it(3) ASIdentifiers_it(3) +ASN1_item_sign(3) +ASN1_item_verify(3) ASRange_it(3) AUTHORITY_INFO_ACCESS_it(3) AUTHORITY_KEYID_it(3) @@ -448,13 +449,13 @@ ERR_load_EVP_strings(3) ERR_load_KDF_strings(3) ERR_load_OBJ_strings(3) ERR_load_OCSP_strings(3) +ERR_load_OSSL_SERIALIZER_strings(3) ERR_load_OSSL_STORE_strings(3) ERR_load_PEM_strings(3) ERR_load_PKCS12_strings(3) ERR_load_PKCS7_strings(3) ERR_load_RAND_strings(3) ERR_load_RSA_strings(3) -ERR_load_OSSL_SERIALIZER_strings(3) ERR_load_TS_strings(3) ERR_load_UI_strings(3) ERR_load_X509V3_strings(3) @@ -479,6 +480,7 @@ 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_CipherInit(3) @@ -730,6 +732,10 @@ OPENSSL_strnlen(3) OPENSSL_uni2asc(3) OPENSSL_uni2utf8(3) OPENSSL_utf82uni(3) +OSSL_CMP_MSG_http_perform(3) +OSSL_CMP_exec_GENM_ses(3) +OSSL_CMP_exec_IR_ses(3) +OSSL_CMP_exec_KUR_ses(3) OSSL_STORE_do_all_loaders(3) OSSL_STORE_vctrl(3) OTHERNAME_cmp(3) @@ -941,6 +947,7 @@ SRP_Calc_u(3) SRP_Calc_x(3) SRP_Verify_A_mod_N(3) SRP_Verify_B_mod_N(3) +SSL_CTX_set0_ctlog_store(3) SXNETID_it(3) SXNET_add_id_INTEGER(3) SXNET_add_id_asc(3) @@ -1074,6 +1081,7 @@ TS_VERIFY_CTX_cleanup(3) TS_VERIFY_CTX_free(3) TS_VERIFY_CTX_init(3) TS_VERIFY_CTX_new(3) +TS_VERIFY_CTX_set_certs(3) TS_VERIFY_CTX_set_data(3) TS_VERIFY_CTX_set_flags(3) TS_VERIFY_CTX_set_imprint(3) @@ -1274,6 +1282,7 @@ 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) @@ -1329,6 +1338,7 @@ 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) @@ -1409,6 +1419,9 @@ i2v_ASN1_BIT_STRING(3) i2v_GENERAL_NAME(3) i2v_GENERAL_NAMES(3) o2i_ECPublicKey(3) +openssl-core_numbers.h(7) +ossl_cmp_certReq_new(3) +provider-kdf(7) s2i_ASN1_IA5STRING(3) s2i_ASN1_INTEGER(3) s2i_ASN1_OCTET_STRING(3) diff --git a/util/other.syms b/util/other.syms index b57af07c7d..62a5a7c843 100644 --- a/util/other.syms +++ b/util/other.syms @@ -209,8 +209,6 @@ ERR_raise define ERR_raise_data define EVP_DigestSignUpdate define EVP_DigestVerifyUpdate define -EVP_KDF_name define -EVP_MAC_name define EVP_MD_CTX_block_size define EVP_MD_CTX_name define EVP_MD_CTX_size define |