X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=util%2Fmkdef.pl;h=a847b0b07738fcfebfd4a47967b636a47dba3dd1;hp=26cf3f4b45d102cd396b205afef5a2660eb52b6a;hb=6b51459026b1936df6177362c88f7d7e2983d138;hpb=e863d92010f250164d0f90cb61e51e3d9429942a diff --git a/util/mkdef.pl b/util/mkdef.pl index 26cf3f4b45..a847b0b077 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -5,7 +5,7 @@ # It does this by parsing the header files and looking for the # prototyped functions: it then prunes the output. # -# Intermediary files are created, call libeay.num and ssleay.num, +# Intermediary files are created, call libcrypto.num and libssl.num, # The format of these files is: # # routine-name nnnn vers info @@ -38,10 +38,14 @@ # exclude. # +use lib "."; +use configdata; +use File::Spec::Functions; + my $debug=0; -my $crypto_num= "util/libeay.num"; -my $ssl_num= "util/ssleay.num"; +my $crypto_num= catfile($config{sourcedir},"util","libcrypto.num"); +my $ssl_num= catfile($config{sourcedir},"util","libssl.num"); my $libname; my $do_update = 0; @@ -63,8 +67,8 @@ my $linux=0; my $safe_stack_def = 0; my @known_platforms = ( "__FreeBSD__", "PERL5", - "EXPORT_VAR_AS_FUNCTION", "ZLIB", - "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" ); + "EXPORT_VAR_AS_FUNCTION", "ZLIB" + ); my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", @@ -81,10 +85,13 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "LOCKING", # External "algorithms" "FP_API", "STDIO", "SOCK", "DGRAM", + "CRYPTO_MDEBUG", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", - # X.509v3 Signed Certificate Timestamps - "SCT", + # Entropy Gathering + "EGD", + # Certificate Transparency + "CT", # RFC3779 "RFC3779", # TLS @@ -93,14 +100,14 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CMS", # CryptoAPI Engine "CAPIENG", - # SSL v3 method - "SSL3_METHOD", - # JPAKE - "JPAKE", + # SSL methods + "SSL3_METHOD", "TLS1_METHOD", "TLS1_1_METHOD", "TLS1_2_METHOD", "DTLS1_METHOD", "DTLS1_2_METHOD", # NEXTPROTONEG "NEXTPROTONEG", # Deprecated functions - "DEPRECATED", + "DEPRECATEDIN_0_9_8", + "DEPRECATEDIN_1_0_0", + "DEPRECATEDIN_1_1_0", # SCTP "SCTP", # SRTP @@ -109,40 +116,25 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SSL_TRACE", # Unit testing "UNIT_TEST", + # User Interface + "UI", # OCB mode "OCB", # APPLINK (win build feature?) "APPLINK" ); -my $options=""; -open(IN,") { - $options=$1 if (/^OPTIONS=(.*)$/); +my %disabled_algorithms; + +foreach (@known_algorithms) { + $disabled_algorithms{$_} = 0; } -close(IN); - -# The following ciphers may be excluded (by Configure). This means functions -# defined with ifndef(NO_XXX) are not included in the .def file, and everything -# in directory xxx is ignored. -my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; -my $no_cast; my $no_whirlpool; my $no_camellia; my $no_seed; -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_aes; my $no_scrypt; -my $no_ec; my $no_engine; my $no_hw; -my $no_chacha; my $no_poly1305; -my $no_fp_api; my $no_static_engine=1; my $no_deprecated; -my $no_sct; my $no_rfc3779; my $no_psk; my $no_cms; my $no_capieng; -my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; -my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; -my $no_unit_test; my $no_ssl3_method; my $no_ocb; - -my $fips; +# disabled by default +$disabled_algorithms{"STATIC_ENGINE"} = 1; my $zlib; - -foreach (@ARGV, split(/ /, $options)) +foreach (@ARGV, split(/ /, $config{options})) { $debug=1 if $_ eq "debug"; $W32=1 if $_ eq "32"; @@ -162,93 +154,60 @@ foreach (@ARGV, split(/ /, $options)) if ($_ eq "linux") { $linux=1; } - $VMS=1 if $_ eq "VMS"; + $VMS=$VMSNonVAX=1 if $_ eq "VMS"; $OS2=1 if $_ eq "OS2"; - $fips=1 if /^fips/; if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic" || $_ eq "enable-zlib-dynamic") { $zlib = 1; } - $do_ssl=1 if $_ eq "ssleay"; + $do_ssl=1 if $_ eq "libssl"; if ($_ eq "ssl") { $do_ssl=1; $libname=$_ } - $do_crypto=1 if $_ eq "libeay"; + $do_crypto=1 if $_ eq "libcrypto"; if ($_ eq "crypto") { $do_crypto=1; $libname=$_; } - $no_static_engine=1 if $_ eq "no-static-engine"; - $no_static_engine=0 if $_ eq "enable-static-engine"; $do_update=1 if $_ eq "update"; $do_rewrite=1 if $_ eq "rewrite"; $do_ctest=1 if $_ eq "ctest"; $do_ctestall=1 if $_ eq "ctestall"; $do_checkexist=1 if $_ eq "exist"; - #$safe_stack_def=1 if $_ eq "-DDEBUG_SAFESTACK"; - - if (/^no-rc2$/) { $no_rc2=1; } - elsif (/^no-rc4$/) { $no_rc4=1; } - elsif (/^no-rc5$/) { $no_rc5=1; } - elsif (/^no-idea$/) { $no_idea=1; } - elsif (/^no-des$/) { $no_des=1; $no_mdc2=1; } - elsif (/^no-bf$/) { $no_bf=1; } - elsif (/^no-cast$/) { $no_cast=1; } - elsif (/^no-whirlpool$/) { $no_whirlpool=1; } - elsif (/^no-md2$/) { $no_md2=1; } - elsif (/^no-md4$/) { $no_md4=1; } - elsif (/^no-md5$/) { $no_md5=1; } - elsif (/^no-sha$/) { $no_sha=1; } - elsif (/^no-ripemd$/) { $no_ripemd=1; } - elsif (/^no-mdc2$/) { $no_mdc2=1; } - elsif (/^no-rsa$/) { $no_rsa=1; } - elsif (/^no-dsa$/) { $no_dsa=1; } - elsif (/^no-dh$/) { $no_dh=1; } - elsif (/^no-ec$/) { $no_ec=1; } - elsif (/^no-aes$/) { $no_aes=1; } - elsif (/^no-camellia$/) { $no_camellia=1; } - elsif (/^no-seed$/) { $no_seed=1; } - elsif (/^no-scrypt$/) { $no_scrypt=1; } - elsif (/^no-chacha$/) { $no_chacha=1; } - elsif (/^no-poly1305$/) { $no_poly1305=1; } - elsif (/^no-evp$/) { $no_evp=1; } - elsif (/^no-lhash$/) { $no_lhash=1; } - elsif (/^no-stack$/) { $no_stack=1; } - elsif (/^no-err$/) { $no_err=1; } - elsif (/^no-buffer$/) { $no_buffer=1; } - elsif (/^no-bio$/) { $no_bio=1; } - #elsif (/^no-locking$/) { $no_locking=1; } - elsif (/^no-comp$/) { $no_comp=1; } - elsif (/^no-dso$/) { $no_dso=1; } - elsif (/^no-engine$/) { $no_engine=1; } - elsif (/^no-hw$/) { $no_hw=1; } - elsif (/^no-sct$/) { $no_sct=1; } - elsif (/^no-rfc3779$/) { $no_rfc3779=1; } - elsif (/^no-cms$/) { $no_cms=1; } - elsif (/^no-ec2m$/) { $no_ec2m=1; } - elsif (/^no-ec-nistp224-64-gcc-128$/) { $no_nistp_gcc=1; } - elsif (/^no-nextprotoneg$/) { $no_nextprotoneg=1; } - elsif (/^no-ssl3-method$/) { $no_ssl3_method=1; } - elsif (/^no-ssl-trace$/) { $no_ssl_trace=1; } - elsif (/^no-capieng$/) { $no_capieng=1; } - elsif (/^no-jpake$/) { $no_jpake=1; } - elsif (/^no-srp$/) { $no_srp=1; } - elsif (/^no-sctp$/) { $no_sctp=1; } - elsif (/^no-srtp$/) { $no_srtp=1; } - elsif (/^no-unit-test$/){ $no_unit_test=1; } - elsif (/^no-deprecated$/) { $no_deprecated=1; } - elsif (/^no-ocb/){ $no_ocb=1; } + if (/^--api=(\d+)\.(\d+)\.(\d+)$/) { + my $apiv = sprintf "%x%02x%02x", $1, $2, $3; + foreach (keys %disabled_algorithms) { + if (/^DEPRECATEDIN_(\d+)_(\d+)_(\d+)$/) { + my $depv = sprintf "%x%02x%02x", $1, $2, $3; + $disabled_algorithms{$_} = 1 if $apiv ge $depv; + } + } + } + if (/^no-deprecated$/) { + foreach (keys %disabled_algorithms) { + if (/^DEPRECATEDIN_/) { + $disabled_algorithms{$_} = 1; + } + } + } + elsif (/^(enable|disable|no)-(.*)$/) { + my $alg = uc $2; + $alg =~ tr/-/_/; + if (exists $disabled_algorithms{$alg}) { + $disabled_algorithms{$alg} = $1 eq "enable" ? 0 : 1; + } } + } if (!$libname) { if ($do_ssl) { - $libname="SSLEAY"; + $libname="LIBSSL"; } if ($do_crypto) { - $libname="LIBEAY"; + $libname="LIBCRYPTO"; } } @@ -256,10 +215,12 @@ if (!$libname) { if ($W32 + $VMS + $OS2 + $linux == 0) { $W32 = 1; } +die "Please, only one platform at a time" + if ($W32 + $VMS + $OS2 + $linux > 1); if (!$do_ssl && !$do_crypto) { - print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT | OS2 ]\n"; + print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT | OS2 | linux | VMS ]\n"; exit(1); } @@ -272,12 +233,12 @@ my $ssl="include/openssl/ssl.h"; $ssl.=" include/openssl/tls1.h"; $ssl.=" include/openssl/srtp.h"; +# We use headers found in include/openssl and include/internal only. +# The latter is needed so libssl.so/.dll/.exe can link properly. my $crypto ="include/openssl/crypto.h"; -$crypto.=" crypto/include/internal/cryptlib.h"; -$crypto.=" crypto/include/internal/chacha.h"; # unless $no_chacha; -$crypto.=" crypto/include/internal/poly1305.h"; # unless $no_poly1305; $crypto.=" include/internal/o_dir.h"; $crypto.=" include/internal/o_str.h"; +$crypto.=" include/internal/threads.h"; $crypto.=" include/openssl/des.h" ; # unless $no_des; $crypto.=" include/openssl/idea.h" ; # unless $no_idea; $crypto.=" include/openssl/rc4.h" ; # unless $no_rc4; @@ -331,43 +292,43 @@ $crypto.=" include/openssl/comp.h" ; # unless $no_comp; $crypto.=" include/openssl/ocsp.h"; $crypto.=" include/openssl/ui.h"; #$crypto.=" include/openssl/store.h"; -$crypto.=" include/openssl/pqueue.h"; $crypto.=" include/openssl/cms.h"; -$crypto.=" include/openssl/jpake.h"; $crypto.=" include/openssl/srp.h"; $crypto.=" include/openssl/modes.h"; $crypto.=" include/openssl/async.h"; +$crypto.=" include/openssl/ct.h"; +$crypto.=" include/openssl/kdf.h"; my $symhacks="include/openssl/symhacks.h"; -my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks); -my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks); +my @ssl_symbols = &do_defs("LIBSSL", $ssl, $symhacks); +my @crypto_symbols = &do_defs("LIBCRYPTO", $crypto, $symhacks); if ($do_update) { if ($do_ssl == 1) { - &maybe_add_info("SSLEAY",*ssl_list,@ssl_symbols); + &maybe_add_info("LIBSSL",*ssl_list,@ssl_symbols); if ($do_rewrite == 1) { open(OUT, ">$ssl_num"); - &rewrite_numbers(*OUT,"SSLEAY",*ssl_list,@ssl_symbols); + &rewrite_numbers(*OUT,"LIBSSL",*ssl_list,@ssl_symbols); } else { open(OUT, ">>$ssl_num"); } - &update_numbers(*OUT,"SSLEAY",*ssl_list,$max_ssl,@ssl_symbols); + &update_numbers(*OUT,"LIBSSL",*ssl_list,$max_ssl,@ssl_symbols); close OUT; } if($do_crypto == 1) { - &maybe_add_info("LIBEAY",*crypto_list,@crypto_symbols); + &maybe_add_info("LIBCRYPTO",*crypto_list,@crypto_symbols); if ($do_rewrite == 1) { open(OUT, ">$crypto_num"); - &rewrite_numbers(*OUT,"LIBEAY",*crypto_list,@crypto_symbols); + &rewrite_numbers(*OUT,"LIBCRYPTO",*crypto_list,@crypto_symbols); } else { open(OUT, ">>$crypto_num"); } - &update_numbers(*OUT,"LIBEAY",*crypto_list,$max_crypto,@crypto_symbols); + &update_numbers(*OUT,"LIBCRYPTO",*crypto_list,$max_crypto,@crypto_symbols); close OUT; } @@ -387,10 +348,10 @@ if($do_crypto == 1) { int main() { EOF - &print_test_file(*STDOUT,"SSLEAY",*ssl_list,$do_ctestall,@ssl_symbols) + &print_test_file(*STDOUT,"LIBSSL",*ssl_list,$do_ctestall,@ssl_symbols) if $do_ssl == 1; - &print_test_file(*STDOUT,"LIBEAY",*crypto_list,$do_ctestall,@crypto_symbols) + &print_test_file(*STDOUT,"LIBCRYPTO",*crypto_list,$do_ctestall,@crypto_symbols) if $do_crypto == 1; print "}\n"; @@ -424,8 +385,9 @@ sub do_defs foreach $file (split(/\s+/,$symhacksfile." ".$files)) { - print STDERR "DEBUG: starting on $file:\n" if $debug; - open(IN,"<$file") || die "unable to open $file:$!\n"; + my $fn = catfile($config{sourcedir},$file); + print STDERR "DEBUG: starting on $fn:\n" if $debug; + open(IN,"<$fn") || die "unable to open $fn:$!\n"; my $line = "", my $def= ""; my %tag = ( (map { $_ => 0 } @known_platforms), @@ -495,14 +457,15 @@ sub do_defs print STDERR "DEBUG: parsing ----------\n" if $debug; while() { if($parens > 0) { - #Inside a DECLARE_DEPRECATED + #Inside a DEPRECATEDIN $stored_multiline .= $_; - chomp $stored_multiline; - print STDERR "DEBUG: Continuing multiline DEPRECATED: $stored_multiline\n" if $debug; + $stored_multiline =~ s|\R$||; # Better chomp + print STDERR "DEBUG: Continuing multiline DEPRECATEDIN: $stored_multiline\n" if $debug; $parens = count_parens($stored_multiline); if ($parens == 0) { - $stored_multiline =~ /^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/; - $def .= "$1(void);"; + $def .= do_deprecated($stored_multiline, + \@current_platforms, + \@current_algorithms); } next; } @@ -517,9 +480,7 @@ sub do_defs } if (/\\$/) { - chomp; # remove eol - chop; # remove ending backslash - $line = $_; + $line = $`; # keep what was before the backslash next; } @@ -536,8 +497,11 @@ sub do_defs $cpp++ if /^#\s*if/; $cpp-- if /^#\s*endif/; next; - } - $cpp = 1 if /^#.*ifdef.*cplusplus/; + } + if (/^#.*ifdef.*cplusplus/) { + $cpp = 1; + next; + } s/{[^{}]*}//gs; # ignore {} blocks print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne ""; @@ -624,6 +588,7 @@ sub do_defs pop(@tag); } elsif (/^\#\s*else/) { my $tag_i = $#tag; + die "$file unmatched else\n" if $tag_i < 0; while($tag[$tag_i] ne "-") { my $t=$tag[$tag_i]; $tag{$t}= -$tag{$t}; @@ -642,6 +607,9 @@ sub do_defs push(@tag,"TRUE"); $tag{"TRUE"}=-1; print STDERR "DEBUG: $file: found 0\n" if $debug; + } elsif (/^\#\s*if\s+/) { + #Some other unrecognized "if" style + push(@tag,"-"); } elsif (/^\#\s*define\s+(\w+)\s+(\w+)/ && $symhacking && $tag{'TRUE'} != -1) { # This is for aliasing. When we find an alias, @@ -676,7 +644,8 @@ sub do_defs next; } if ($tag{'TRUE'} != -1) { - if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) { + if (/^\s*DEFINE_STACK_OF\s*\(\s*(\w*)\s*\)/ + || /^\s*DEFINE_STACK_OF_CONST\s*\(\s*(\w*)\s*\)/) { next; } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) { $def .= "int d2i_$3(void);"; @@ -896,14 +865,16 @@ sub do_defs &$make_variant("_shadow_$2","_shadow_$2", "EXPORT_VAR_AS_FUNCTION", "FUNCTION"); - } elsif (/^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/) { + } elsif (/^\s*DEPRECATEDIN/) { $parens = count_parens($_); if ($parens == 0) { - $def .= "$1(void);"; + $def .= do_deprecated($_, + \@current_platforms, + \@current_algorithms); } else { $stored_multiline = $_; - chomp $stored_multiline; - print STDERR "DEBUG: Found multiline DEPRECATED starting with: $stored_multiline\n" if $debug; + $stored_multiline =~ s|\R$||; + print STDERR "DEBUG: Found multiline DEPRECATEDIN starting with: $stored_multiline\n" if $debug; next; } } elsif ($tag{'CONST_STRICT'} != 1) { @@ -916,6 +887,7 @@ sub do_defs } } close(IN); + die "$file: Unmatched tags\n" if $#tag >= 0; my $algs; my $plays; @@ -968,22 +940,6 @@ sub do_defs $p = $plats; $a = $algs; - $a .= ",BF" if($s =~ /EVP_bf/); - $a .= ",CAST" if($s =~ /EVP_cast/); - $a .= ",DES" if($s =~ /EVP_des/); - $a .= ",DSA" if($s =~ /EVP_dss/); - $a .= ",IDEA" if($s =~ /EVP_idea/); - $a .= ",MD2" if($s =~ /EVP_md2/); - $a .= ",MD4" if($s =~ /EVP_md4/); - $a .= ",MD5" if($s =~ /EVP_md5/); - $a .= ",RC2" if($s =~ /EVP_rc2/); - $a .= ",RC4" if($s =~ /EVP_rc4/); - $a .= ",RC5" if($s =~ /EVP_rc5/); - $a .= ",RMD160" if($s =~ /EVP_ripemd/); - $a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/); - $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/); - $a .= ",RSA" if($s =~ /RSAPrivateKey/); - $a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/); $platform{$s} = &reduce_platforms((defined($platform{$s})?$platform{$s}.',':"").$p); @@ -1081,7 +1037,8 @@ sub reduce_platforms return $ret; } -sub info_string { +sub info_string +{ (my $symbol, my $exist, my $platforms, my $kind, my $algorithms) = @_; my %a = defined($algorithms) ? @@ -1099,20 +1056,20 @@ sub info_string { return $ret; } -sub maybe_add_info { +sub maybe_add_info +{ (my $name, *nums, my @symbols) = @_; my $sym; my $new_info = 0; my %syms=(); - print STDERR "Updating $name info\n"; foreach $sym (@symbols) { (my $s, my $i) = split /\\/, $sym; if (defined($nums{$s})) { $i =~ s/^(.*?:.*?:\w+)(\(\w+\))?/$1/; - (my $n, my $dummy) = split /\\/, $nums{$s}; + (my $n, my $vers, my $dummy) = split /\\/, $nums{$s}; if (!defined($dummy) || $i ne $dummy) { - $nums{$s} = $n."\\".$i; + $nums{$s} = $n."\\".$vers."\\".$i; $new_info++; print STDERR "DEBUG: maybe_add_info for $s: \"$dummy\" => \"$i\"\n" if $debug; } @@ -1122,19 +1079,18 @@ sub maybe_add_info { my @s=sort { &parse_number($nums{$a},"n") <=> &parse_number($nums{$b},"n") } keys %nums; foreach $sym (@s) { - (my $n, my $i) = split /\\/, $nums{$sym}; + (my $n, my $vers, my $i) = split /\\/, $nums{$sym}; if (!defined($syms{$sym}) && $i !~ /^NOEXIST:/) { $new_info++; print STDERR "DEBUG: maybe_add_info for $sym: -> undefined\n" if $debug; } } if ($new_info) { - print STDERR "$new_info old symbols got an info update\n"; + print STDERR "$name: $new_info old symbols have updated info\n"; if (!$do_rewrite) { print STDERR "You should do a rewrite to fix this.\n"; } } else { - print STDERR "No old symbols needed info update\n"; } } @@ -1165,70 +1121,11 @@ sub is_valid if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32)) { return 1; } - if ($keyword eq "OPENSSL_FIPSCAPABLE") { - return 0; - } - if ($keyword eq "OPENSSL_FIPS" && $fips) { - return 1; - } if ($keyword eq "ZLIB" && $zlib) { return 1; } return 0; } else { # algorithms - if ($keyword eq "RC2" && $no_rc2) { return 0; } - if ($keyword eq "RC4" && $no_rc4) { return 0; } - if ($keyword eq "RC5" && $no_rc5) { return 0; } - if ($keyword eq "IDEA" && $no_idea) { return 0; } - if ($keyword eq "DES" && $no_des) { return 0; } - if ($keyword eq "BF" && $no_bf) { return 0; } - if ($keyword eq "CAST" && $no_cast) { return 0; } - if ($keyword eq "MD2" && $no_md2) { return 0; } - if ($keyword eq "MD4" && $no_md4) { return 0; } - if ($keyword eq "MD5" && $no_md5) { return 0; } - if ($keyword eq "SHA" && $no_sha) { return 0; } - if ($keyword eq "RMD160" && $no_ripemd) { return 0; } - if ($keyword eq "MDC2" && $no_mdc2) { return 0; } - if ($keyword eq "WHIRLPOOL" && $no_whirlpool) { return 0; } - if ($keyword eq "RSA" && $no_rsa) { return 0; } - if ($keyword eq "DSA" && $no_dsa) { return 0; } - if ($keyword eq "DH" && $no_dh) { return 0; } - if ($keyword eq "EC" && $no_ec) { return 0; } - if ($keyword eq "AES" && $no_aes) { return 0; } - if ($keyword eq "CAMELLIA" && $no_camellia) { return 0; } - if ($keyword eq "SEED" && $no_seed) { return 0; } - if ($keyword eq "SCRYPT" && $no_scrypt) { return 0; } - if ($keyword eq "CHACHA" && $no_chacha) { return 0; } - if ($keyword eq "POLY1305" && $no_poly1305) { return 0; } - if ($keyword eq "EVP" && $no_evp) { return 0; } - if ($keyword eq "LHASH" && $no_lhash) { return 0; } - if ($keyword eq "STACK" && $no_stack) { return 0; } - if ($keyword eq "ERR" && $no_err) { return 0; } - if ($keyword eq "BUFFER" && $no_buffer) { return 0; } - if ($keyword eq "BIO" && $no_bio) { return 0; } - if ($keyword eq "COMP" && $no_comp) { return 0; } - if ($keyword eq "DSO" && $no_dso) { return 0; } - if ($keyword eq "ENGINE" && $no_engine) { return 0; } - if ($keyword eq "HW" && $no_hw) { return 0; } - if ($keyword eq "FP_API" && $no_fp_api) { return 0; } - if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } - if ($keyword eq "SCT" && $no_sct) { return 0; } - if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; } - if ($keyword eq "PSK" && $no_psk) { return 0; } - if ($keyword eq "CMS" && $no_cms) { return 0; } - if ($keyword eq "EC_NISTP_64_GCC_128" && $no_nistp_gcc) - { return 0; } - if ($keyword eq "EC2M" && $no_ec2m) { return 0; } - if ($keyword eq "NEXTPROTONEG" && $no_nextprotoneg) { return 0; } - if ($keyword eq "SSL3_METHOD" && $no_ssl3_method) { return 0; } - if ($keyword eq "SSL_TRACE" && $no_ssl_trace) { return 0; } - if ($keyword eq "CAPIENG" && $no_capieng) { return 0; } - if ($keyword eq "JPAKE" && $no_jpake) { return 0; } - if ($keyword eq "SRP" && $no_srp) { return 0; } - if ($keyword eq "SCTP" && $no_sctp) { return 0; } - if ($keyword eq "SRTP" && $no_srtp) { return 0; } - if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; } - if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } - if ($keyword eq "OCB" && $no_ocb) { return 0; } + if ($disabled_algorithms{$keyword} == 1) { return 0;} # Nothing recognise as true return 1; @@ -1273,7 +1170,7 @@ sub print_test_file } $prev = $s2; # To warn about duplicates... - ($nn,$ni)=($nums{$s2} =~ /^(.*?)\\(.*)$/); + (my $nn, my $vers, my $ni) = split /\\/, $nums{$s2}; if ($v) { print OUT "\textern int $s2; /* type unknown */ /* $nn $ni */\n"; } else { @@ -1283,15 +1180,9 @@ sub print_test_file } } -sub get_version { - local *MF; - my $v = '?'; - open MF, 'Makefile' or return $v; - while () { - $v = $1, last if /^VERSION=(.*?)\s*$/; - } - close MF; - return $v; +sub get_version +{ + return $config{version}; } sub print_def_file @@ -1305,27 +1196,30 @@ sub print_def_file my $what = "OpenSSL: implementation of Secure Socket Layer"; my $description = "$what $version, $name - http://$http_vendor"; my $prevsymversion = "", $prevprevsymversion = ""; - - if (!$linux) - { - if ($W32) - { $libname.="32"; } - elsif ($OS2) - { # DLL names should not clash on the whole system. - # However, they should not have any particular relationship - # to the name of the static library. Chose descriptive names - # (must be at most 8 chars). - my %translate = (ssl => 'open_ssl', crypto => 'cryptssl'); - $libname = $translate{$name} || $name; - $liboptions = < 'open_ssl', crypto => 'cryptssl'); + $libname = $translate{$name} || $name; + $liboptions = <[1] } + sort { $a->[0] <=> $b->[0] } + map { (my $s, my $i) = $_ =~ /^(.*?)\\(.*)$/; + die "Error: $s doesn't have a number assigned\n" + if !defined($nums{$s}); + (my $n, my @rest) = split /\\/, $nums{$s}; + [ $n, $_ ] } (@e, @r, @v)); + } else { + @symbols=((sort @e),(sort @r), (sort @v)); + } my ($baseversion, $currversion) = get_openssl_version(); my $thisversion; @@ -1385,6 +1298,37 @@ EOF $prevsymversion = $symversion; } print OUT " $s2;\n"; + } elsif ($VMS) { + while(++$prevnum < $n) { + my $symline=" ,SPARE -\n ,SPARE -\n"; + if ($symvtextcount + length($symline) - 2 > 1024) { + print OUT ")\nSYMBOL_VECTOR=(-\n"; + $symvtextcount = 16; # length of "SYMBOL_VECTOR=(-" + } + if ($symvtextcount == 16) { + # Take away first comma + $symline =~ s/,//; + } + print OUT $symline; + $symvtextcount += length($symline) - 2; + } + (my $s_uc = $s) =~ tr/a-z/A-Z/; + my $symtype= + $v ? "DATA" : "PROCEDURE"; + my $symline= + ($s_uc ne $s + ? " ,$s_uc/$s=$symtype -\n ,$s=$symtype -\n" + : " ,$s=$symtype -\n ,SPARE -\n"); + if ($symvtextcount + length($symline) - 2 > 1024) { + print OUT ")\nSYMBOL_VECTOR=(-\n"; + $symvtextcount = 16; # length of "SYMBOL_VECTOR=(-" + } + if ($symvtextcount == 16) { + # Take away first comma + $symline =~ s/,//; + } + print OUT $symline; + $symvtextcount += length($symline) - 2; } elsif($v && !$OS2) { printf OUT " %s%-39s @%-8d DATA\n", ($W32)?"":"_",$s2,$n; @@ -1402,7 +1346,14 @@ EOF } else { print OUT " local: *;\n};\n\n"; } - } + } elsif ($VMS) { + print OUT ")\n"; + (my $libvmaj, my $libvmin, my $libvedit) = + $currversion =~ /^(\d+)_(\d+)_(\d+)$/; + # The reason to multiply the edit number with 100 is to make space + # for the possibility that we want to encode the patch letters + print OUT "GSMATCH=LEQUAL,",($libvmaj * 100 + $libvmin),",",($libvedit * 100),"\n"; + } printf OUT "\n"; } @@ -1421,7 +1372,7 @@ sub load_numbers open(IN,"<$name") || die "unable to open $name:$!\n"; while () { - chop; + s|\R$||; # Better chomp s/#.*$//; next if /^\s*$/; @a=split; @@ -1474,7 +1425,7 @@ sub load_numbers sub parse_number { (my $str, my $what) = @_; - (my $n, my $i) = split(/\\/,$str); + (my $n, my $v, my $i) = split(/\\/,$str); if ($what eq "n") { return $n; } else { @@ -1487,8 +1438,6 @@ sub rewrite_numbers (*OUT,$name,*nums,@symbols)=@_; my $thing; - print STDERR "Rewriting $name\n"; - my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); my $r; my %r; my %rsyms; foreach $r (@r) { @@ -1510,7 +1459,7 @@ sub rewrite_numbers || $a cmp $b } keys %nums; foreach $sym (@s) { - (my $n, my $i) = split /\\/, $nums{$sym}; + (my $n, my $vers, my $i) = split /\\/, $nums{$sym}; next if defined($i) && $i =~ /^.*?:.*?:\w+\(\w+\)/; next if defined($rsyms{$sym}); print STDERR "DEBUG: rewrite_numbers for sym = ",$sym,": i = ",$i,", n = ",$n,", rsym{sym} = ",$rsyms{$sym},"syms{sym} = ",$syms{$sym},"\n" if $debug; @@ -1518,12 +1467,12 @@ sub rewrite_numbers if !defined($i) || $i eq "" || !defined($syms{$sym}); my $s2 = $sym; $s2 =~ s/\{[0-9]+\}$//; - printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i; + printf OUT "%s%-39s %d\t%s\t%s\n","",$s2,$n,$vers,$i; if (exists $r{$sym}) { (my $s, $i) = split /\\/,$r{$sym}; my $s2 = $s; $s2 =~ s/\{[0-9]+\}$//; - printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i; + printf OUT "%s%-39s %d\t%s\t%s\n","",$s2,$n,$vers,$i; } } } @@ -1532,8 +1481,10 @@ sub update_numbers { (*OUT,$name,*nums,my $start_num, my @symbols)=@_; my $new_syms = 0; + my $basevers; + my $vers; - print STDERR "Updating $name numbers\n"; + ($basevers, $vers) = get_openssl_version(); my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); my $r; my %r; my %rsyms; @@ -1551,23 +1502,22 @@ sub update_numbers next if defined($rsyms{$sym}); die "ERROR: Symbol $sym had no info attached to it." if $i eq ""; - next if $i =~ /OPENSSL_FIPSCAPABLE/; if (!exists $nums{$s}) { $new_syms++; my $s2 = $s; $s2 =~ s/\{[0-9]+\}$//; - printf OUT "%s%-39s %d\t%s\n","",$s2, ++$start_num,$i; + printf OUT "%s%-39s %d\t%s\t%s\n","",$s2, ++$start_num,$vers,$i; if (exists $r{$s}) { ($s, $i) = split /\\/,$r{$s}; $s =~ s/\{[0-9]+\}$//; - printf OUT "%s%-39s %d\t%s\n","",$s, $start_num,$i; + printf OUT "%s%-39s %d\t%s\t%s\n","",$s, $start_num,$vers,$i; } } } if($new_syms) { - print STDERR "$new_syms New symbols added\n"; + print STDERR "$name: Added $new_syms new symbols\n"; } else { - print STDERR "No New symbols Added\n"; + print STDERR "$name: No new symbols added\n"; } } @@ -1608,12 +1558,13 @@ sub count_parens #version sub get_openssl_version() { - open (IN, "include/openssl/opensslv.h") || die "Can't open opensslv.h"; + my $fn = catfile($config{sourcedir},"include","openssl","opensslv.h"); + open (IN, "$fn") || die "Can't open opensslv.h"; while() { if (/OPENSSL_VERSION_TEXT\s+"OpenSSL (\d\.\d\.)(\d[a-z]*)(-| )/) { my $suffix = $2; - my $baseversion = $1 =~ s/\./_/gr; + (my $baseversion = $1) =~ s/\./_/g; close IN; return ($baseversion."0", $baseversion.$suffix); } @@ -1733,3 +1684,16 @@ sub check_version_lte() if (($cvbase ne $tvbase) && ($tvletter gt $cvletter)); } } + +sub do_deprecated() +{ + my ($decl, $plats, $algs) = @_; + $decl =~ /^\s*(DEPRECATEDIN_\d+_\d+_\d+)\s*\((.*)\)\s*$/ + or die "Bad DEPRECTEDIN: $decl\n"; + my $info1 .= "#INFO:"; + $info1 .= join(',', @{$plats}) . ":"; + my $info2 = $info1; + $info1 .= join(',',@{$algs}, $1) . ";"; + $info2 .= join(',',@{$algs}) . ";"; + return $info1 . $2 . ";" . $info2; +}