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

openssl/crypto/conf/conf_lib.c

 /* conf_lib.c */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 51 matching lines @@
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
 #include <openssl/lhash.h>
 
 const char CONF_version[]="CONF" OPENSSL_VERSION_PTEXT;
 
 static CONF_METHOD *default_CONF_method=NULL;
 
 /* Init a 'CONF' structure from an old LHASH */
 
-void CONF_set_nconf(CONF *conf, LHASH *hash)
+void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash)
         {
         if (default_CONF_method == NULL)
                 default_CONF_method = NCONF_default();
 
         default_CONF_method->init(conf);
         conf->data = hash;
         }
 
 /* The following section contains the "CONF classic" functions,
    rewritten in terms of the new CONF interface. */
 
 int CONF_set_default_method(CONF_METHOD *meth)
         {
         default_CONF_method = meth;
         return 1;
         }
 
-LHASH *CONF_load(LHASH *conf, const char *file, long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
+                                long *eline)
         {
-        LHASH *ltmp;
+        LHASH_OF(CONF_VALUE) *ltmp;
         BIO *in=NULL;
 
 #ifdef OPENSSL_SYS_VMS
         in=BIO_new_file(file, "r");
 #else
         in=BIO_new_file(file, "rb");
 #endif
         if (in == NULL)
                 {
                 CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
                 return NULL;
                 }
 
         ltmp = CONF_load_bio(conf, in, eline);
         BIO_free(in);
 
         return ltmp;
         }
 
 #ifndef OPENSSL_NO_FP_API
-LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
+                                   long *eline)
         {
         BIO *btmp;
-        LHASH *ltmp;
+        LHASH_OF(CONF_VALUE) *ltmp;
         if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
                 CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB);
                 return NULL;
         }
         ltmp = CONF_load_bio(conf, btmp, eline);
         BIO_free(btmp);
         return ltmp;
         }
 #endif
 
-LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
+                                    long *eline)
         {
         CONF ctmp;
         int ret;
 
         CONF_set_nconf(&ctmp, conf);
 
         ret = NCONF_load_bio(&ctmp, bp, eline);
         if (ret)
                 return ctmp.data;
         return NULL;
         }
 
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,const char *section)
+STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
+                                       const char *section)
         {
         if (conf == NULL)
                 {
                 return NULL;
                 }
         else
                 {
                 CONF ctmp;
                 CONF_set_nconf(&ctmp, conf);
                 return NCONF_get_section(&ctmp, section);
                 }
         }
 
-char *CONF_get_string(LHASH *conf,const char *group,const char *name)
+char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf,const char *group,
+                      const char *name)
         {
         if (conf == NULL)
                 {
                 return NCONF_get_string(NULL, group, name);
                 }
         else
                 {
                 CONF ctmp;
                 CONF_set_nconf(&ctmp, conf);
                 return NCONF_get_string(&ctmp, group, name);
                 }
         }
 
-long CONF_get_number(LHASH *conf,const char *group,const char *name)
+long CONF_get_number(LHASH_OF(CONF_VALUE) *conf,const char *group,
+                     const char *name)
         {
         int status;
         long result = 0;
 
         if (conf == NULL)
                 {
                 status = NCONF_get_number_e(NULL, group, name, &result);
                 }
         else
                 {
                 CONF ctmp;
                 CONF_set_nconf(&ctmp, conf);
                 status = NCONF_get_number_e(&ctmp, group, name, &result);
                 }
 
         if (status == 0)
                 {
                 /* This function does not believe in errors... */
                 ERR_clear_error();
                 }
         return result;
         }
 
-void CONF_free(LHASH *conf)
+void CONF_free(LHASH_OF(CONF_VALUE) *conf)
         {
         CONF ctmp;
         CONF_set_nconf(&ctmp, conf);
         NCONF_free_data(&ctmp);
         }
 
 #ifndef OPENSSL_NO_FP_API
-int CONF_dump_fp(LHASH *conf, FILE *out)
+int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
         {
         BIO *btmp;
         int ret;
 
         if(!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) {
                 CONFerr(CONF_F_CONF_DUMP_FP,ERR_R_BUF_LIB);
                 return 0;
         }
         ret = CONF_dump_bio(conf, btmp);
         BIO_free(btmp);
         return ret;
         }
 #endif
 
-int CONF_dump_bio(LHASH *conf, BIO *out)
+int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out)
         {
         CONF ctmp;
         CONF_set_nconf(&ctmp, conf);
         return NCONF_dump_bio(&ctmp, out);
         }
 
 /* The following section contains the "New CONF" functions.  They are
    completely centralised around a new CONF structure that may contain
    basically anything, but at least a method pointer and a table of data.
    These functions are also written in terms of the bridge functions used
@@ skipping 166 matching lines @@
 
         status = NCONF_get_number_e(conf, group, name, &ret);
         if (status == 0)
                 {
                 /* This function does not believe in errors... */
                 ERR_get_error();
                 }
         return ret;
         }
 #endif