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

openssl/apps/asn1pars.c

 /* apps/asn1pars.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 78 matching lines @@
         int i,badops=0,offset=0,ret=1,j;
         unsigned int length=0;
         long num,tmplen;
         BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
         int informat,indent=0, noout = 0, dump = 0;
         char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
         char *genstr=NULL, *genconf=NULL;
         unsigned char *tmpbuf;
         const unsigned char *ctmpbuf;
         BUF_MEM *buf=NULL;
-        STACK *osk=NULL;
+        STACK_OF(OPENSSL_STRING) *osk=NULL;
         ASN1_TYPE *at=NULL;
 
         informat=FORMAT_PEM;
 
         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);
 
         if (!load_config(bio_err, NULL))
                 goto end;
 
         prog=argv[0];
         argc--;
         argv++;
-        if ((osk=sk_new_null()) == NULL)
+        if ((osk=sk_OPENSSL_STRING_new_null()) == NULL)
                 {
                 BIO_printf(bio_err,"Memory allocation failure\n");
                 goto end;
                 }
         while (argc >= 1)
                 {
                 if      (strcmp(*argv,"-inform") == 0)
                         {
                         if (--argc < 1) goto bad;
                         informat=str2fmt(*(++argv));
@@ skipping 35 matching lines @@
                         }
                 else if (strcmp(*argv,"-dlimit") == 0)
                         {
                         if (--argc < 1) goto bad;
                         dump= atoi(*(++argv));
                         if (dump <= 0) goto bad;
                         }
                 else if (strcmp(*argv,"-strparse") == 0)
                         {
                         if (--argc < 1) goto bad;
-                        sk_push(osk,*(++argv));
+                        sk_OPENSSL_STRING_push(osk,*(++argv));
                         }
                 else if (strcmp(*argv,"-genstr") == 0)
                         {
                         if (--argc < 1) goto bad;
                         genstr= *(++argv);
                         }
                 else if (strcmp(*argv,"-genconf") == 0)
                         {
                         if (--argc < 1) goto bad;
                         genconf= *(++argv);
@@ skipping 112 matching lines @@
                         if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
                         i=BIO_read(in,&(buf->data[num]),BUFSIZ);
                         if (i <= 0) break;
                         num+=i;
                         }
                 }
         str=buf->data;
 
         /* If any structs to parse go through in sequence */
 
-        if (sk_num(osk))
+        if (sk_OPENSSL_STRING_num(osk))
                 {
                 tmpbuf=(unsigned char *)str;
                 tmplen=num;
-                for (i=0; i<sk_num(osk); i++)
+                for (i=0; i<sk_OPENSSL_STRING_num(osk); i++)
                         {
                         ASN1_TYPE *atmp;
                         int typ;
-                        j=atoi(sk_value(osk,i));
+                        j=atoi(sk_OPENSSL_STRING_value(osk,i));
                         if (j == 0)
                                 {
-                                BIO_printf(bio_err,"'%s' is an invalid number\n",sk_value(osk,i));
+                                BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i));
                                 continue;
                                 }
                         tmpbuf+=j;
                         tmplen-=j;
                         atmp = at;
                         ctmpbuf = tmpbuf;
                         at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
                         ASN1_TYPE_free(atmp);
                         if(!at)
                                 {
@@ skipping 44 matching lines @@
         ret=0;
 end:
         BIO_free(derout);
         if (in != NULL) BIO_free(in);
         if (out != NULL) BIO_free_all(out);
         if (b64 != NULL) BIO_free(b64);
         if (ret != 0)
                 ERR_print_errors(bio_err);
         if (buf != NULL) BUF_MEM_free(buf);
         if (at != NULL) ASN1_TYPE_free(at);
-        if (osk != NULL) sk_free(osk);
+        if (osk != NULL) sk_OPENSSL_STRING_free(osk);
         OBJ_cleanup();
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
         {
         CONF *cnf = NULL;
         int len;
         long errline;
         unsigned char *p;
         ASN1_TYPE *atyp = NULL;
 
         if (genconf)
                 {
                 cnf = NCONF_new(NULL);
                 if (!NCONF_load(cnf, genconf, &errline))
                         goto conferr;
                 if (!genstr)
                         genstr = NCONF_get_string(cnf, "default", "asn1");
                 if (!genstr)
                         {
                         BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
                         goto err;
                         }
                 }
 
         atyp = ASN1_generate_nconf(genstr, cnf);
         NCONF_free(cnf);
+        cnf = NULL;
 
         if (!atyp)
                 return -1;
 
         len = i2d_ASN1_TYPE(atyp, NULL);
 
         if (len <= 0)
                 goto err;
 
         if (!BUF_MEM_grow(buf,len))
@@ skipping 14 matching lines @@
         else
                 BIO_printf(bio, "Error loading config file '%s'\n", genconf);
 
         err:
         NCONF_free(cnf);
         ASN1_TYPE_free(atyp);
 
         return -1;
 
         }