From c063f2c5ec5afda27ffda674ccd593289fd6f4af Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 9 Feb 2001 18:16:12 +0000 Subject: Various Win32 related fixed. Make no-krb5 work in mkdef.pl . Fix warning in apps/engine.c Remove definitions of deleted functions. Add missing definition of X509_VAL. --- util/mkdef.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/mkdef.pl b/util/mkdef.pl index bcf875f546..a9e1a16cb7 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -99,7 +99,7 @@ close(IN); my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; my $no_cast; my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; -my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; +my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_fp_api; foreach (@ARGV, split(/ /, $options)) @@ -150,6 +150,7 @@ foreach (@ARGV, split(/ /, $options)) #elsif (/^no-locking$/) { $no_locking=1; } elsif (/^no-comp$/) { $no_comp=1; } elsif (/^no-dso$/) { $no_dso=1; } + elsif (/^no-krb5$/) { $no_krb5=1; } } @@ -738,8 +739,8 @@ sub print_test_file foreach $sym (@symbols) { (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/; if ($s ne $prev) { - if (!defined($nums{$sym})) { - printf STDERR "Warning: $sym does not have a number assigned\n" + if (!defined($nums{$s})) { + printf STDERR "Warning: $s does not have a number assigned\n" if(!$do_update); } else { $n=$nums{$s}; @@ -838,6 +839,7 @@ EOF && (!@a || (!$no_dh || !grep(/^DH$/,@a))) && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a))) && (!@a || (!$no_aes || !grep(/^AES$/,@a))) + && (!@a || (!$no_krb5 || !grep(/^KRB5$/,@a))) && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a))) ) { if($v) { -- cgit v1.2.3