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

openssl/apps/pkcs7.c

 /* apps/pkcs7.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 64 matching lines @@
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
  * -print_certs
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *e = NULL;
-#endif
         PKCS7 *p7=NULL;
         int i,badops=0;
         BIO *in=NULL,*out=NULL;
         int informat,outformat;
         char *infile,*outfile,*prog;
-        int print_certs=0,text=0,noout=0;
+        int print_certs=0,text=0,noout=0,p7_print=0;
         int ret=1;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
 
         apps_startup();
 
         if (bio_err == NULL)
                 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                         BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
@@ skipping 28 matching lines @@
                         }
                 else if (strcmp(*argv,"-out") == 0)
                         {
                         if (--argc < 1) goto bad;
                         outfile= *(++argv);
                         }
                 else if (strcmp(*argv,"-noout") == 0)
                         noout=1;
                 else if (strcmp(*argv,"-text") == 0)
                         text=1;
+                else if (strcmp(*argv,"-print") == 0)
+                        p7_print=1;
                 else if (strcmp(*argv,"-print_certs") == 0)
                         print_certs=1;
 #ifndef OPENSSL_NO_ENGINE
                 else if (strcmp(*argv,"-engine") == 0)
                         {
                         if (--argc < 1) goto bad;
                         engine= *(++argv);
                         }
 #endif
                 else
@@ skipping 21 matching lines @@
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
                 ret = 1;
                 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 37 matching lines @@
                 }
         else
                 {
                 if (BIO_write_filename(out,outfile) <= 0)
                         {
                         perror(outfile);
                         goto end;
                         }
                 }
 
+        if (p7_print)
+                PKCS7_print_ctx(out, p7, 0, NULL);
+
         if (print_certs)
                 {
                 STACK_OF(X509) *certs=NULL;
                 STACK_OF(X509_CRL) *crls=NULL;
 
                 i=OBJ_obj2nid(p7->type);
                 switch (i)
                         {
                 case NID_pkcs7_signed:
                         certs=p7->d.sign->cert;
@@ skipping 58 matching lines @@
                         }
         }
         ret=0;
 end:
         if (p7 != NULL) PKCS7_free(p7);
         if (in != NULL) BIO_free(in);
         if (out != NULL) BIO_free_all(out);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }