Commit 5043fc9f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix mkerr.pl to find functions returning function pointers (thanks Ulf!) 

also add a few missing prototypes.
parent 8e945b5e

crypto/bn/bn.h

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ int BN_lshift1(); 
int	BN_exp();

int	BN_mod_exp();

int	BN_mod_exp_mont();

int	BN_mod_exp2_mont();

int	BN_mod_exp_recp();

int	BN_mod_exp_simple();

int	BN_mask_bits();

crypto/x509/x509_vfy.h

+2 −2
Original line number Diff line number Diff line
@@ -222,11 +222,9 @@ struct x509_store_state_st 
#define X509_L_FILE_LOAD	1

#define X509_L_ADD_DIR		2



X509_LOOKUP_METHOD *X509_LOOKUP_file();

#define X509_LOOKUP_load_file(x,name,type) \

		X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)



X509_LOOKUP_METHOD *X509_LOOKUP_dir();

#define X509_LOOKUP_add_dir(x,name,type) \

		X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
@@ -275,6 +273,7 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); 


X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);

X509_LOOKUP_METHOD *X509_LOOKUP_file(void);

X509_LOOKUP_METHOD *X509_LOOKUP_dir(void);



int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);

int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
@@ -338,6 +337,7 @@ X509_LOOKUP *X509_STORE_add_lookup(); 


X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir();

X509_LOOKUP_METHOD *X509_LOOKUP_file();

X509_LOOKUP_METHOD *X509_LOOKUP_dir();



int X509_STORE_add_cert();

int X509_STORE_add_crl();

util/mkerr.pl

+9 −6
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ while(<IN>) 
	} elsif (/^R\s+(\S+)\s+(\S+)/) {

		$rextra{$1} = $2;

		$rcodes{$1} = $2;

	# Add extra reason with $1, value $2

	}

}
@@ -114,20 +113,24 @@ while (($lib, $hdr) = each %hinc) 
	foreach (split /;/, $def) {

	    s/^[\n\s]*//g;

	    s/[\n\s]*$//g;

	    next if (/\w+\W+(\w+)\W*\(\s*\)$/s); # K&R C

	    next if (/\(\*(\w*)\([^\)]+/);

	    if (/\w+\W+\w+\W*\(.*\)$/s) {

	    next if(/typedef\W/);

	    if (/\(\*(\w*)\([^\)]+/) {

		my $name = $1;

		$name =~ tr/[a-z]/[A-Z]/;

		$ftrans{$name} = $1;

	    } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s){

		# K&R C

		next ;

	    } elsif (/\w+\W+\w+\W*\(.*\)$/s) {

		while (not /\(\)$/s) {

		    s/[^\(\)]*\)$/\)/s;

		    s/\([^\(\)]*\)\)$/\)/s;

		}

		s/\(void\)//;

		/(\w+)\W*\(\)/s;

		next if(/typedef\W/);

		my $name = $1;

		$name =~ tr/[a-z]/[A-Z]/;

		$ftrans{$name} = $1;

		

	    } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {

		print STDERR "Header $hdr: cannot parse: $_;\n";

	    }