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

openssl/apps/dhparam.c

 /* apps/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
  * the following conditions are aheared to.  The following conditions
@@ skipping 131 matching lines @@
  * -text
  * -C
  */
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 
 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;
 #ifndef OPENSSL_NO_DSA
         int dsaparam=0;
 #endif
         BIO *in=NULL,*out=NULL;
         int informat,outformat,check=0,noout=0,C=0,ret=1;
         char *infile,*outfile,*prog;
         char *inrand=NULL;
 #ifndef OPENSSL_NO_ENGINE
@@ skipping 98 matching lines @@
                 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");
                 BIO_printf(bio_err," -noout        no output\n");
                 goto end;
                 }
 
         ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
         if (g && !num)
                 num = DEFBITS;
 
 #ifndef OPENSSL_NO_DSA
         if (dsaparam)
                 {
                 if (g)
                         {
@@ skipping 263 matching lines @@
         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