X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Fmkdef.pl;h=c2fbfe7062f3a4f7443796eb5d579d87cfec9be7;hp=3151800007ac4197f5ed54b64d04d07d28d8ab5d;hb=2bc57c88d852d83ee31f68f5b84b36d54b4c3dc4;hpb=cc373a37a193dbd00be20fc358b03403338ff873 diff --git a/util/mkdef.pl b/util/mkdef.pl index 3151800007..c2fbfe7062 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1,11 +1,18 @@ -#!/usr/local/bin/perl -w +#! /usr/bin/env perl +# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + # # generate a .def file # # 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 @@ -40,11 +47,12 @@ 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; @@ -60,7 +68,6 @@ my $VMSNonVAX=0; my $VMS=0; my $W32=0; my $NT=0; -my $OS2=0; my $linux=0; # Set this to make typesafe STACK definitions appear in DEF my $safe_stack_def = 0; @@ -74,7 +81,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SHA256", "SHA512", "RMD160", "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", - "SCRYPT", "CHACHA", "POLY1305", + "SCRYPT", "CHACHA", "POLY1305", "BLAKE2", # EC_NISTP_64_GCC_128 "EC_NISTP_64_GCC_128", # Envelope "algorithms" @@ -89,20 +96,19 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "STATIC_ENGINE", "ENGINE", "HW", "GMP", # Entropy Gathering "EGD", - # X.509v3 Signed Certificate Timestamps - "SCT", + # Certificate Transparency + "CT", # RFC3779 "RFC3779", # TLS "PSK", "SRP", "HEARTBEATS", # CMS "CMS", + "OCSP", # 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 @@ -117,8 +123,13 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SSL_TRACE", # Unit testing "UNIT_TEST", + # User Interface + "UI", + # + "TS", # OCB mode "OCB", + "CMAC", # APPLINK (win build feature?) "APPLINK" ); @@ -154,18 +165,17 @@ foreach (@ARGV, split(/ /, $config{options})) $linux=1; } $VMS=$VMSNonVAX=1 if $_ eq "VMS"; - $OS2=1 if $_ eq "OS2"; 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=$_; @@ -175,7 +185,6 @@ foreach (@ARGV, split(/ /, $config{options})) $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 (/^--api=(\d+)\.(\d+)\.(\d+)$/) { my $apiv = sprintf "%x%02x%02x", $1, $2, $3; foreach (keys %disabled_algorithms) { @@ -204,19 +213,19 @@ foreach (@ARGV, split(/ /, $config{options})) if (!$libname) { if ($do_ssl) { - $libname="SSLEAY"; + $libname="LIBSSL"; } if ($do_crypto) { - $libname="LIBEAY"; + $libname="LIBCRYPTO"; } } # If no platform is given, assume WIN32 -if ($W32 + $VMS + $OS2 + $linux == 0) { +if ($W32 + $VMS + $linux == 0) { $W32 = 1; } die "Please, only one platform at a time" - if ($W32 + $VMS + $OS2 + $linux > 1); + if ($W32 + $VMS + $linux > 1); if (!$do_ssl && !$do_crypto) { @@ -233,12 +242,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/err.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; @@ -269,7 +278,7 @@ $crypto.=" include/openssl/engine.h"; # unless $no_engine; $crypto.=" include/openssl/stack.h" ; # unless $no_stack; $crypto.=" include/openssl/buffer.h" ; # unless $no_buffer; $crypto.=" include/openssl/bio.h" ; # unless $no_bio; -$crypto.=" include/openssl/dso.h" ; # unless $no_dso; +$crypto.=" include/internal/dso.h" ; # unless $no_dso; $crypto.=" include/openssl/lhash.h" ; # unless $no_lhash; $crypto.=" include/openssl/conf.h"; $crypto.=" include/openssl/txt_db.h"; @@ -293,41 +302,42 @@ $crypto.=" include/openssl/ocsp.h"; $crypto.=" include/openssl/ui.h"; #$crypto.=" include/openssl/store.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; } @@ -347,10 +357,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"; @@ -384,8 +394,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), @@ -457,7 +468,7 @@ sub do_defs if($parens > 0) { #Inside a DEPRECATEDIN $stored_multiline .= $_; - chomp $stored_multiline; + $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) { @@ -478,9 +489,7 @@ sub do_defs } if (/\\$/) { - chomp; # remove eol - chop; # remove ending backslash - $line = $_; + $line = $`; # keep what was before the backslash next; } @@ -497,8 +506,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 ""; @@ -585,6 +597,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}; @@ -603,6 +616,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, @@ -637,7 +653,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);"; @@ -865,7 +882,7 @@ sub do_defs \@current_algorithms); } else { $stored_multiline = $_; - chomp $stored_multiline; + $stored_multiline =~ s|\R$||; print STDERR "DEBUG: Found multiline DEPRECATEDIN starting with: $stored_multiline\n" if $debug; next; } @@ -879,6 +896,7 @@ sub do_defs } } close(IN); + die "$file: Unmatched tags\n" if $#tag >= 0; my $algs; my $plays; @@ -1104,7 +1122,6 @@ sub is_valid if ($keyword eq "VMS" && $VMS) { return 1; } if ($keyword eq "WIN32" && $W32) { return 1; } if ($keyword eq "WINNT" && $NT) { return 1; } - if ($keyword eq "OS2" && $OS2) { return 1; } # Special platforms: # EXPORT_VAR_AS_FUNCTION means that global variables # will be represented as functions. This currently @@ -1193,22 +1210,8 @@ sub print_def_file 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 = < 1024) { + 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) { - $symline = ",".$symline; + if ($symvtextcount == 16) { + # Take away first comma + $symline =~ s/,//; } - print OUT " $symline\n"; - $symvtextcount += length($symline); + 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, $s=$symtype" - : "$s=$symtype, SPARE") - ." -"; - if ($symvtextcount + length($symline) + 1 > 1024) { + ? " ,$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) { - $symline = ",".$symline; + if ($symvtextcount == 16) { + # Take away first comma + $symline =~ s/,//; } - print OUT " $symline\n"; - $symvtextcount += length($symline); - } elsif($v && !$OS2) { - printf OUT " %s%-39s @%-8d DATA\n", - ($W32)?"":"_",$s2,$n; + print OUT $symline; + $symvtextcount += length($symline) - 2; + } elsif($v) { + printf OUT " %s%-39s DATA\n", + ($W32)?"":"_",$s2; } else { - printf OUT " %s%-39s @%d\n", - ($W32||$OS2)?"":"_",$s2,$n; + printf OUT " %s%s\n", + ($W32)?"":"_",$s2; } } } @@ -1366,7 +1366,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; @@ -1552,7 +1552,8 @@ 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]*)(-| )/) {