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

openssl/apps/crl2p7.c

 /* apps/crl2p7.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 45 matching lines @@
  * [including the GNU Public Licence.]
  */
 
 /* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
  * and donated 'to the cause' along with lots and lots of other fixes to
  * the library. */
 
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>
 #include <openssl/objects.h>
 
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG    crl2pkcs7_main
 
 /* -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
         int i,badops=0;
         BIO *in=NULL,*out=NULL;
         int informat,outformat;
         char *infile,*outfile,*prog,*certfile;
         PKCS7 *p7 = NULL;
         PKCS7_SIGNED *p7s = NULL;
         X509_CRL *crl=NULL;
-        STACK *certflst=NULL;
+        STACK_OF(OPENSSL_STRING) *certflst=NULL;
         STACK_OF(X509_CRL) *crl_stack=NULL;
         STACK_OF(X509) *cert_stack=NULL;
         int ret=1,nocrl=0;
 
         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 27 matching lines @@
                         nocrl=1;
                         }
                 else if (strcmp(*argv,"-out") == 0)
                         {
                         if (--argc < 1) goto bad;
                         outfile= *(++argv);
                         }
                 else if (strcmp(*argv,"-certfile") == 0)
                         {
                         if (--argc < 1) goto bad;
-                        if(!certflst) certflst = sk_new_null();
-                        sk_push(certflst,*(++argv));
+                        if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
+                        sk_OPENSSL_STRING_push(certflst,*(++argv));
                         }
                 else
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
                         badops=1;
                         break;
                         }
                 argc--;
                 argv++;
                 }
@@ skipping 64 matching lines @@
         p7s->crl=crl_stack;
         if (crl != NULL)
                 {
                 sk_X509_CRL_push(crl_stack,crl);
                 crl=NULL; /* now part of p7 for OPENSSL_freeing */
                 }
 
         if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
         p7s->cert=cert_stack;
 
-        if(certflst) for(i = 0; i < sk_num(certflst); i++) {
-                certfile = sk_value(certflst, i);
+        if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+                certfile = sk_OPENSSL_STRING_value(certflst, i);
                 if (add_certs_from_file(cert_stack,certfile) < 0)
                         {
                         BIO_printf(bio_err, "error loading certificates\n");
                         ERR_print_errors(bio_err);
                         goto end;
                         }
         }
 
-        sk_free(certflst);
+        sk_OPENSSL_STRING_free(certflst);
 
         if (outfile == NULL)
                 {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
                 {
                 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                 out = BIO_push(tmpbio, out);
                 }
 #endif
@@ skipping 37 matching lines @@
  * int add_certs_from_file
  *
  *      Read a list of certificates to be checked from a file.
  *
  * Results:
  *      number of certs added if successful, -1 if not.
  *----------------------------------------------------------------------
  */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
         {
-        struct stat st;
         BIO *in=NULL;
         int count=0;
         int ret= -1;
         STACK_OF(X509_INFO) *sk=NULL;
         X509_INFO *xi;
 
-        if ((stat(certfile,&st) != 0))
-                {
-                BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
-                goto end;
-                }
-
         in=BIO_new(BIO_s_file());
         if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
                 {
                 BIO_printf(bio_err,"error opening the file, %s\n",certfile);
                 goto end;
                 }
 
         /* This loads from a file, a stack of x509/crl/pkey sets */
         sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
         if (sk == NULL) {
@@ skipping 15 matching lines @@
                 }
 
         ret=count;
 end:
         /* never need to OPENSSL_free x */
         if (in != NULL) BIO_free(in);
         if (sk != NULL) sk_X509_INFO_free(sk);
         return(ret);
         }