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

openssl/apps/dh.c

 /* apps/dh.c */
 /* obsoleted by dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
@@ skipping 70 matching lines @@
  * -check       - check the parameters are ok
  * -noout
  * -text
  * -C
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *e = NULL;
-#endif
         DH *dh=NULL;
         int i,badops=0,text=0;
         BIO *in=NULL,*out=NULL;
         int informat,outformat,check=0,noout=0,C=0,ret=1;
         char *infile,*outfile,*prog;
 #ifndef OPENSSL_NO_ENGINE
         char *engine;
 #endif
 
         apps_startup();
@@ skipping 78 matching lines @@
                 BIO_printf(bio_err," -noout        no output\n");
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
                 goto end;
                 }
 
         ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
         in=BIO_new(BIO_s_file());
         out=BIO_new(BIO_s_file());
         if ((in == NULL) || (out == NULL))
                 {
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
@@ skipping 139 matching lines @@
                         }
                 }
         ret=0;
 end:
         if (in != NULL) BIO_free(in);
         if (out != NULL) BIO_free_all(out);
         if (dh != NULL) DH_free(dh);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }
+#else /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif