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

openssl/apps/gendh.c

 /* apps/gendh.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 71 matching lines @@
 #undef PROG
 #define PROG gendh_main
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
         BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *e = NULL;
-#endif
         DH *dh=NULL;
         int ret=1,num=DEFBITS;
         int g=2;
         char *outfile=NULL;
         char *inrand=NULL;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
         BIO *out=NULL;
 
@@ skipping 51 matching lines @@
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
 #endif
                 BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
                 BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
                 BIO_printf(bio_err,"             the random number generator\n");
                 goto end;
                 }
                 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
         out=BIO_new(BIO_s_file());
         if (out == NULL)
                 {
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
         if (outfile == NULL)
@@ skipping 51 matching lines @@
         if (p == 1) c='+';
         if (p == 2) c='*';
         if (p == 3) c='\n';
         BIO_write(cb->arg,&c,1);
         (void)BIO_flush(cb->arg);
 #ifdef LINT
         p=n;
 #endif
         return 1;
         }
+#else /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif