From 0d867e697ff266bc864479d51ca468934ca8e031 Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 14 Dec 2021 20:21:45 +0000 Subject: [PATCH] more symbols that are postponed or intentionally undocumented and some regexp tweaks; the relevant parts of asn1.h are nearing completion --- regress/lib/libcrypto/man/check_complete.pl | 61 +++++++++++++++++++-- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/regress/lib/libcrypto/man/check_complete.pl b/regress/lib/libcrypto/man/check_complete.pl index 3af44218b60..4d703299ae7 100755 --- a/regress/lib/libcrypto/man/check_complete.pl +++ b/regress/lib/libcrypto/man/check_complete.pl @@ -18,7 +18,42 @@ use strict; use warnings; my @obsolete = qw( + ASN1_dup ASN1_d2i_bio ASN1_d2i_bio_of ASN1_d2i_fp ASN1_d2i_fp_of + ASN1_i2d_bio ASN1_i2d_bio_of ASN1_i2d_bio_of_const + ASN1_i2d_fp ASN1_i2d_fp_of ASN1_i2d_fp_of_const + ASN1_LONG_UNDEF + ASN1_OBJECT_FLAG_CRITICAL ASN1_OBJECT_FLAG_DYNAMIC + ASN1_OBJECT_FLAG_DYNAMIC_DATA ASN1_OBJECT_FLAG_DYNAMIC_STRINGS + ASN1_STRING_FLAG_BITS_LEFT ASN1_STRING_FLAG_CONT + ASN1_STRING_FLAG_MSTRING ASN1_STRING_FLAG_NDEF + CHARTYPE_FIRST_ESC_2253 CHARTYPE_LAST_ESC_2253 CHARTYPE_PRINTABLESTRING + d2i_NETSCAPE_X509 + NETSCAPE_X509_free NETSCAPE_X509_new + i2d_NETSCAPE_X509 + ub_title + V_ASN1_PRIMATIVE_TAG + X509_algor_st + X509_EX_V_INIT X509_EX_V_NETSCAPE_HACK + X509_EXT_PACK_STRING X509_EXT_PACK_UNKNOWN + X509_VERIFY_PARAM_ID +); + +# postponed +push @obsolete, qw( + ASN1_ITEM_ptr ASN1_ITEM_ref ASN1_ITEM_rptr + CHECKED_D2I_OF CHECKED_I2D_OF CHECKED_NEW_OF CHECKED_PPTR_OF CHECKED_PTR_OF + DECLARE_ASN1_ALLOC_FUNCTIONS DECLARE_ASN1_ALLOC_FUNCTIONS_name + DECLARE_ASN1_ENCODE_FUNCTIONS DECLARE_ASN1_ENCODE_FUNCTIONS_const + DECLARE_ASN1_FUNCTIONS DECLARE_ASN1_FUNCTIONS_const + DECLARE_ASN1_FUNCTIONS_fname DECLARE_ASN1_FUNCTIONS_name + DECLARE_ASN1_ITEM + DECLARE_ASN1_NDEF_FUNCTION + DECLARE_ASN1_PRINT_FUNCTION DECLARE_ASN1_PRINT_FUNCTION_fname + DECLARE_ASN1_SET_OF + D2I_OF d2i_PBEPARAM d2i_PBE2PARAM d2i_PBKDF2PARAM + IMPLEMENT_ASN1_SET_OF + I2D_OF I2D_OF_const i2d_PBEPARAM i2d_PBE2PARAM i2d_PBKDF2PARAM NETSCAPE_SPKAC NETSCAPE_SPKI PBEPARAM PBEPARAM_free PBEPARAM_new @@ -27,9 +62,7 @@ my @obsolete = qw( PKCS5_pbe_set PKCS5_pbe_set0_algor PKCS5_pbe2_set PKCS5_pbe2_set_iv PKCS5_pbkdf2_set - X509_EX_V_INIT X509_EX_V_NETSCAPE_HACK - X509_EXT_PACK_STRING X509_EXT_PACK_UNKNOWN - X509_VERIFY_PARAM_ID + TYPEDEF_D2I_OF TYPEDEF_D2I2D_OF TYPEDEF_I2D_OF ); my $MANW = 'man -M /usr/share/man -w'; @@ -180,11 +213,15 @@ try_again: print "Fn $line\n" if $verbose; next; } - unless (system qw/grep -qR/, '^\.\\\\" ' . $id . '\>', + unless (system qw/grep -qR/, '^\.\\\\" .*\<' . $id . '\>', "$srcdir/") { print "D- $line\n" if $verbose; next; } + if ($id =~ /^ASN1_PCTX_FLAGS_\w+$/) { + print "D- $line\n" if $verbose; + next; + } if ($id =~ /^(?:ASN1|X509(?:V3)?)_[FR]_\w+$/) { print "D- $line\n" if $verbose; next; @@ -210,11 +247,15 @@ try_again: print "Fn $line\n" if $verbose; next; } - unless (system qw/grep -qR/, '^\.\\\\" .*' . $id . '(3)', + unless (system qw/grep -qR/, '^\.\\\\" .*\<' . $id . '(3)', "$srcdir/") { print "F- $line\n" if $verbose; next; } + if (grep { $_ eq $id } @obsolete) { + print "F- $line\n" if $verbose; + next; + } if ($verbose) { print "XX $line\n"; } else { @@ -230,6 +271,10 @@ try_again: print "Vt $line\n" if $verbose; next; } + if (grep { $_ eq $id } @obsolete) { + print "V- $line\n" if $verbose; + next; + } if ($verbose) { print "XX $line\n"; } else { @@ -286,7 +331,7 @@ try_again: print "F- $line\n" if $verbose; next; } - unless (system qw/grep -qR/, '^\.\\\\" .*' . $id . '\>', + unless (system qw/grep -qR/, '^\.\\\\" .*\<' . $id . '\>', "$srcdir/") { print "F- $line\n" if $verbose; next; @@ -295,6 +340,10 @@ try_again: print "F- $line\n" if $verbose; next; } + if ($id =~ /^ASN1_PCTX_\w+$/) { + print "F- $line\n" if $verbose; + next; + } if ($verbose) { print "XX $line\n"; } else { -- 2.20.1