X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkdef.pl;h=d20bac6e840e266e77d26d8d108651e9231d3391;hb=c130dd8ea4d09cb708aac9e41bd25c2f5fa7ea38;hp=ea6655a8ec60436d56197254db18a4ca9f0eb100;hpb=1a53f1d68b0444655743fc87e8e9f535d090fa20;p=oweals%2Fopenssl.git diff --git a/util/mkdef.pl b/util/mkdef.pl index ea6655a8ec..d20bac6e84 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -69,6 +69,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SHA256", "SHA512", "RMD160", "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", + "SCRYPT", # EC_NISTP_64_GCC_128 "EC_NISTP_64_GCC_128", # Envelope "algorithms" @@ -77,11 +78,15 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR", "LOCKING", # External "algorithms" - "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM", + "FP_API", "STDIO", "SOCK", "DGRAM", # Engines - "STATIC_ENGINE", "ENGINE", "HW", "GMP", + "STATIC_ENGINE", "ENGINE", "HW", "GMP", + # X.509v3 Signed Certificate Timestamps + "SCT", + # RFC3779 + "RFC3779", # TLS - "TLSEXT", "PSK", "SRP", "HEARTBEATS", + "PSK", "SRP", "HEARTBEATS", # CMS "CMS", # CryptoAPI Engine @@ -121,10 +126,10 @@ 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_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_krb5; +my $no_rsa; my $no_dsa; my $no_dh; my $no_aes; my $no_scrypt; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; -my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; +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; @@ -201,6 +206,7 @@ foreach (@ARGV, split(/ /, $options)) 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-evp$/) { $no_evp=1; } elsif (/^no-lhash$/) { $no_lhash=1; } elsif (/^no-stack$/) { $no_stack=1; } @@ -210,11 +216,11 @@ 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; } elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } - elsif (/^no-tlsext$/) { $no_tlsext=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; } @@ -257,79 +263,76 @@ $max_ssl = $max_num; %crypto_list=&load_numbers($crypto_num); $max_crypto = $max_num; -my $ssl="ssl/ssl.h"; -$ssl.=" ssl/kssl.h"; -$ssl.=" ssl/tls1.h"; -$ssl.=" ssl/srtp.h"; - -my $crypto ="crypto/crypto.h"; -$crypto.=" crypto/cryptlib.h"; -$crypto.=" crypto/o_dir.h"; -$crypto.=" crypto/o_str.h"; -$crypto.=" crypto/des/des.h" ; # unless $no_des; -$crypto.=" crypto/idea/idea.h" ; # unless $no_idea; -$crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4; -$crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5; -$crypto.=" crypto/rc2/rc2.h" ; # unless $no_rc2; -$crypto.=" crypto/bf/blowfish.h" ; # unless $no_bf; -$crypto.=" crypto/cast/cast.h" ; # unless $no_cast; -$crypto.=" crypto/whrlpool/whrlpool.h" ; -$crypto.=" crypto/md2/md2.h" ; # unless $no_md2; -$crypto.=" crypto/md4/md4.h" ; # unless $no_md4; -$crypto.=" crypto/md5/md5.h" ; # unless $no_md5; -$crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2; -$crypto.=" crypto/sha/sha.h" ; # unless $no_sha; -$crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd; -$crypto.=" crypto/aes/aes.h" ; # unless $no_aes; -$crypto.=" crypto/camellia/camellia.h" ; # unless $no_camellia; -$crypto.=" crypto/seed/seed.h"; # unless $no_seed; - -$crypto.=" crypto/bn/bn.h"; -$crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa; -$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa; -$crypto.=" crypto/dh/dh.h" ; # unless $no_dh; -$crypto.=" crypto/ec/ec.h" ; # unless $no_ec; -$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa; -$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh; -$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac; -$crypto.=" crypto/cmac/cmac.h" ; - -$crypto.=" crypto/engine/engine.h"; # unless $no_engine; -$crypto.=" crypto/stack/stack.h" ; # unless $no_stack; -$crypto.=" crypto/buffer/buffer.h" ; # unless $no_buffer; -$crypto.=" crypto/bio/bio.h" ; # unless $no_bio; -$crypto.=" crypto/dso/dso.h" ; # unless $no_dso; -$crypto.=" crypto/lhash/lhash.h" ; # unless $no_lhash; -$crypto.=" crypto/conf/conf.h"; -$crypto.=" crypto/txt_db/txt_db.h"; - -$crypto.=" crypto/evp/evp.h" ; # unless $no_evp; -$crypto.=" crypto/objects/objects.h"; -$crypto.=" crypto/pem/pem.h"; -#$crypto.=" crypto/meth/meth.h"; -$crypto.=" crypto/asn1/asn1.h"; -$crypto.=" crypto/asn1/asn1t.h"; -$crypto.=" crypto/asn1/asn1_mac.h"; -$crypto.=" crypto/err/err.h" ; # unless $no_err; -$crypto.=" crypto/pkcs7/pkcs7.h"; -$crypto.=" crypto/pkcs12/pkcs12.h"; -$crypto.=" crypto/x509/x509.h"; -$crypto.=" crypto/x509/x509_vfy.h"; -$crypto.=" crypto/x509v3/x509v3.h"; -$crypto.=" crypto/ts/ts.h"; -$crypto.=" crypto/rand/rand.h"; -$crypto.=" crypto/comp/comp.h" ; # unless $no_comp; -$crypto.=" crypto/ocsp/ocsp.h"; -$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h"; -$crypto.=" crypto/krb5/krb5_asn.h"; -#$crypto.=" crypto/store/store.h"; -$crypto.=" crypto/pqueue/pqueue.h"; -$crypto.=" crypto/cms/cms.h"; -$crypto.=" crypto/jpake/jpake.h"; -$crypto.=" crypto/srp/srp.h"; -$crypto.=" crypto/modes/modes.h"; - -my $symhacks="crypto/symhacks.h"; +my $ssl="include/openssl/ssl.h"; +$ssl.=" include/openssl/tls1.h"; +$ssl.=" include/openssl/srtp.h"; + +my $crypto ="include/openssl/crypto.h"; +$crypto.=" crypto/include/internal/cryptlib.h"; +$crypto.=" include/internal/o_dir.h"; +$crypto.=" include/internal/o_str.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; +$crypto.=" include/openssl/rc5.h" ; # unless $no_rc5; +$crypto.=" include/openssl/rc2.h" ; # unless $no_rc2; +$crypto.=" include/openssl/blowfish.h" ; # unless $no_bf; +$crypto.=" include/openssl/cast.h" ; # unless $no_cast; +$crypto.=" include/openssl/whrlpool.h" ; +$crypto.=" include/openssl/md2.h" ; # unless $no_md2; +$crypto.=" include/openssl/md4.h" ; # unless $no_md4; +$crypto.=" include/openssl/md5.h" ; # unless $no_md5; +$crypto.=" include/openssl/mdc2.h" ; # unless $no_mdc2; +$crypto.=" include/openssl/sha.h" ; # unless $no_sha; +$crypto.=" include/openssl/ripemd.h" ; # unless $no_ripemd; +$crypto.=" include/openssl/aes.h" ; # unless $no_aes; +$crypto.=" include/openssl/camellia.h" ; # unless $no_camellia; +$crypto.=" include/openssl/seed.h"; # unless $no_seed; + +$crypto.=" include/openssl/bn.h"; +$crypto.=" include/openssl/rsa.h" ; # unless $no_rsa; +$crypto.=" include/openssl/dsa.h" ; # unless $no_dsa; +$crypto.=" include/openssl/dh.h" ; # unless $no_dh; +$crypto.=" include/openssl/ec.h" ; # unless $no_ec; +$crypto.=" include/openssl/ecdsa.h" ; # unless $no_ecdsa; +$crypto.=" include/openssl/ecdh.h" ; # unless $no_ecdh; +$crypto.=" include/openssl/hmac.h" ; # unless $no_hmac; +$crypto.=" include/openssl/cmac.h" ; + +$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/openssl/lhash.h" ; # unless $no_lhash; +$crypto.=" include/openssl/conf.h"; +$crypto.=" include/openssl/txt_db.h"; + +$crypto.=" include/openssl/evp.h" ; # unless $no_evp; +$crypto.=" include/openssl/objects.h"; +$crypto.=" include/openssl/pem.h"; +#$crypto.=" include/openssl/meth.h"; +$crypto.=" include/openssl/asn1.h"; +$crypto.=" include/openssl/asn1t.h"; +$crypto.=" include/openssl/err.h" ; # unless $no_err; +$crypto.=" include/openssl/pkcs7.h"; +$crypto.=" include/openssl/pkcs12.h"; +$crypto.=" include/openssl/x509.h"; +$crypto.=" include/openssl/x509_vfy.h"; +$crypto.=" include/openssl/x509v3.h"; +$crypto.=" include/openssl/ts.h"; +$crypto.=" include/openssl/rand.h"; +$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"; + +my $symhacks="include/openssl/symhacks.h"; my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks); my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks); @@ -487,7 +490,14 @@ sub do_defs while() { if($parens > 0) { #Inside a DECLARE_DEPRECATED - $parens += count_parens($_); + $stored_multiline .= $_; + chomp $stored_multiline; + print STDERR "DEBUG: Continuing multiline DEPRECATED: $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);"; + } next; } if (/\/\* Error codes for the \w+ functions\. \*\//) @@ -881,9 +891,15 @@ sub do_defs "EXPORT_VAR_AS_FUNCTION", "FUNCTION"); } elsif (/^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/) { - $def .= "$1(void);"; $parens = count_parens($_); - next; + if ($parens == 0) { + $def .= "$1(void);"; + } else { + $stored_multiline = $_; + chomp $stored_multiline; + print STDERR "DEBUG: Found multiline DEPRECATED starting with: $stored_multiline\n" if $debug; + next; + } } elsif ($tag{'CONST_STRICT'} != 1) { if (/\{|\/\*|\([^\)]*$/) { $line = $_; @@ -1176,6 +1192,7 @@ sub is_valid 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 "EVP" && $no_evp) { return 0; } if ($keyword eq "LHASH" && $no_lhash) { return 0; } if ($keyword eq "STACK" && $no_stack) { return 0; } @@ -1184,13 +1201,13 @@ sub is_valid 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 "KRB5" && $no_krb5) { 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 "GMP" && $no_gmp) { return 0; } - if ($keyword eq "TLSEXT" && $no_tlsext) { 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)