Upgrade chrome's OpenSSL to same version Android ships with.

openssl/util/mkdef.pl

 #!/usr/local/bin/perl -w
 #
 # 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,...
 # Previously, they had the following format:
 #
@@ skipping 60 matching lines @@
 my $VMSVAX=0;
 my $VMSNonVAX=0;
 my $VMS=0;
 my $W32=0;
 my $W16=0;
 my $NT=0;
 my $OS2=0;
 # Set this to make typesafe STACK definitions appear in DEF
 my $safe_stack_def = 0;
 
-my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", "NETWARE",
-                        "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS"); 
+my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
+                        "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
                          "SHA256", "SHA512", "RIPEMD",
-                         "MDC2", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "HMAC", "AES", "CAMELLIA", "SEED",
+                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA",
+                         "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
                          # Envelope "algorithms"
                          "EVP", "X509", "ASN1_TYPEDEFS",
                          # Helper "algorithms"
                          "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",
                          "LOCKING",
                          # External "algorithms"
                          "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
                          # Engines
                          "STATIC_ENGINE", "ENGINE", "HW", "GMP",
-                         # RFC3779 support 
+                         # RFC3779
                          "RFC3779",
-                         # TLS extension support
-                         "TLSEXT",
+                         # TLS
+                         "TLSEXT", "PSK",
                          # CMS
                          "CMS",
                          # CryptoAPI Engine
                          "CAPIENG",
+                         # SSL v2
+                         "SSL2",
                          # JPAKE
                          "JPAKE",
                          # Deprecated functions
                          "DEPRECATED" );
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $options=$1 if (/^OPTIONS=(.*)$/);
 }
 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_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_hmac=0; my $no_aes; my $no_krb5;
-my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
-my $no_seed;
-my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
-my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake;
-my $fips;
+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_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
+my $no_jpake; my $no_ssl2;
+
+my $zlib;
 
 
 foreach (@ARGV, split(/ /, $options))
         {
         $debug=1 if $_ eq "debug";
         $W32=1 if $_ eq "32";
         $W16=1 if $_ eq "16";
         if($_ eq "NT") {
                 $W32 = 1;
                 $NT = 1;
         }
         if ($_ eq "VMS-VAX") {
                 $VMS=1;
                 $VMSVAX=1;
         }
         if ($_ eq "VMS-NonVAX") {
                 $VMS=1;
                 $VMSNonVAX=1;
         }
         $VMS=1 if $_ eq "VMS";
         $OS2=1 if $_ eq "OS2";
-        $fips=1 if /^fips/;
-
-        if ($_ eq "zlib" || $_ eq "zlib-dynamic"
-                         || $_ eq "enable-zlib-dynamic") {
-                $zlib = 1;
+        if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
+                         || $_ eq "enable-zlib-dynamic") {
+                $zlib = 1;
         }
 
         $do_ssl=1 if $_ eq "ssleay";
         if ($_ eq "ssl") {
                 $do_ssl=1; 
                 $libname=$_
         }
         $do_crypto=1 if $_ eq "libeay";
         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; }
@@ skipping 12 matching lines @@
         #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-rfc3779$/)  { $no_rfc3779=1; }
         elsif (/^no-tlsext$/)   { $no_tlsext=1; }
         elsif (/^no-cms$/)      { $no_cms=1; }
+        elsif (/^no-ssl2$/)     { $no_ssl2=1; }
         elsif (/^no-capieng$/)  { $no_capieng=1; }
         elsif (/^no-jpake$/)    { $no_jpake=1; }
         }
 
 
 if (!$libname) { 
         if ($do_ssl) {
                 $libname="SSLEAY";
         }
         if ($do_crypto) {
@@ skipping 21 matching lines @@
 $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";
 
 my $crypto ="crypto/crypto.h";
 $crypto.=" crypto/o_dir.h";
+$crypto.=" crypto/o_str.h";
+$crypto.=" crypto/o_time.h";
 $crypto.=" crypto/des/des.h crypto/des/des_old.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;
 
@@ skipping 21 matching lines @@
 #$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/tmdiff.h";
-$crypto.=" crypto/store/store.h";
+#$crypto.=" crypto/store/store.h";
 $crypto.=" crypto/pqueue/pqueue.h";
 $crypto.=" crypto/cms/cms.h";
 $crypto.=" crypto/jpake/jpake.h";
-$crypto.=" fips/fips.h fips/rand/fips_rand.h";
+$crypto.=" crypto/modes/modes.h";
 
 my $symhacks="crypto/symhacks.h";
 
 my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks);
 my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks);
 
 if ($do_update) {
 
 if ($do_ssl == 1) {
 
@@ skipping 553 matching lines @@
                         # Reduce argument lists to empty ()
                         # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
                         while(/\(.*\)/s) {
                                 s/\([^\(\)]+\)/\{\}/gs;
                                 s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;    #(*f{}) -> f
                         }
                         # pretend as we didn't use curly braces: {} -> ()
                         s/\{\}/\(\)/gs;
 
                         s/STACK_OF\(\)/void/gs;
+                        s/LHASH_OF\(\)/void/gs;
 
                         print STDERR "DEBUG: \$_ = \"$_\"\n" if $debug;
                         if (/^\#INFO:([^:]*):(.*)$/) {
                                 $plats = $1;
                                 $algs = $2;
                                 print STDERR "DEBUG: found info on platforms ($plats) and algorithms ($algs)\n" if $debug;
                                 next;
                         } elsif (/^\s*OPENSSL_EXTERN\s.*?(\w+(\{[0-9]+\})?)(\[[0-9]*\])*\s*$/) {
                                 $s = $1;
                                 $k = "VARIABLE";
@@ skipping 56 matching lines @@
 
         # Prune the returned symbols
 
         delete $syms{"bn_dump1"};
         $platform{"BIO_s_log"} .= ",!WIN32,!WIN16,!macintosh";
 
         $platform{"PEM_read_NS_CERT_SEQ"} = "VMS";
         $platform{"PEM_write_NS_CERT_SEQ"} = "VMS";
         $platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS";
         $platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS";
-
         $platform{"EVP_sha384"} = "!VMSVAX";
         $platform{"EVP_sha512"} = "!VMSVAX";
         $platform{"SHA384_Init"} = "!VMSVAX";
         $platform{"SHA384_Transform"} = "!VMSVAX";
         $platform{"SHA384_Update"} = "!VMSVAX";
         $platform{"SHA384_Final"} = "!VMSVAX";
         $platform{"SHA384"} = "!VMSVAX";
         $platform{"SHA512_Init"} = "!VMSVAX";
         $platform{"SHA512_Transform"} = "!VMSVAX";
         $platform{"SHA512_Update"} = "!VMSVAX";
         $platform{"SHA512_Final"} = "!VMSVAX";
         $platform{"SHA512"} = "!VMSVAX";
+        $platform{"WHIRLPOOL_Init"} = "!VMSVAX";
+        $platform{"WHIRLPOOL"} = "!VMSVAX";
+        $platform{"WHIRLPOOL_BitUpdate"} = "!VMSVAX";
+        $platform{"EVP_whirlpool"} = "!VMSVAX";
+        $platform{"WHIRLPOOL_Final"} = "!VMSVAX";
+        $platform{"WHIRLPOOL_Update"} = "!VMSVAX";
 
-        $platform{"pqueue_print"} = "!VMSVAX";
 
         # Info we know about
 
         push @ret, map { $_."\\".&info_string($_,"EXIST",
                                               $platform{$_},
                                               $kind{$_},
                                               $algorithm{$_}) } keys %syms;
 
         if (keys %unknown_algorithms) {
                 print STDERR "WARNING: mkdef.pl doesn't know the following algorithms:\n";
@@ skipping 104 matching lines @@
         my (@keywords) = split /,/,$keywords_txt;
         my ($falsesum, $truesum) = (0, 1);
 
         # Param: one keyword
         sub recognise
         {
                 my ($keyword,$platforms) = @_;
 
                 if ($platforms) {
                         # platforms
-                        if ($keyword eq "VMS" && $VMS) { return 1; }
                         if ($keyword eq "VMSVAX" && $VMSVAX) { return 1; }
                         if ($keyword eq "VMSNonVAX" && $VMSNonVAX) { return 1; }
+                        if ($keyword eq "VMS" && $VMS) { return 1; }
                         if ($keyword eq "WIN32" && $W32) { return 1; }
                         if ($keyword eq "WIN16" && $W16) { 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
                         # only happens on VMS-VAX.
                         if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
                                 return 1;
                         }
-                        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 "RIPEMD" && $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 "ECDSA" && $no_ecdsa) { return 0; }
                         if ($keyword eq "ECDH" && $no_ecdh) { return 0; }
                         if ($keyword eq "HMAC" && $no_hmac) { 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 "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 "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 "RFC3779" && $no_rfc3779) { return 0; }
                         if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
+                        if ($keyword eq "PSK" && $no_psk) { return 0; }
                         if ($keyword eq "CMS" && $no_cms) { return 0; }
+                        if ($keyword eq "SSL2" && $no_ssl2) { return 0; }
                         if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
                         if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
                         if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                         # Nothing recognise as true
                         return 1;
                 }
         }
 
         foreach $k (@keywords) {
@@ skipping 314 matching lines @@
                 }
         }
         if(@remaining) {
                 print STDERR "The following symbols do not seem to exist:\n";
                 foreach $sym (@remaining) {
                         print STDERR "\t",$sym,"\n";
                 }
         }
 }