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

openssl/crypto/ex_data.c

 /* crypto/ex_data.c */
 
 /*
  * Overhaul notes;
  *
  * This code is now *mostly* thread-safe. It is now easier to understand in what
  * ways it is safe and in what ways it is not, which is an improvement. Firstly,
  * all per-class stacks and index-counters for ex_data are stored in the same
  * global LHASH table (keyed by class). This hash table uses locking for all
  * access with the exception of CRYPTO_cleanup_all_ex_data(), which must only be
@@ skipping 227 matching lines @@
 typedef struct st_ex_class_item {
         int class_index;
         STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth;
         int meth_num;
 } EX_CLASS_ITEM;
 
 /* When assigning new class indexes, this is our counter */
 static int ex_class = CRYPTO_EX_INDEX_USER;
 
 /* The global hash table of EX_CLASS_ITEM items */
-static LHASH *ex_data = NULL;
+DECLARE_LHASH_OF(EX_CLASS_ITEM);
+static LHASH_OF(EX_CLASS_ITEM) *ex_data = NULL;
 
 /* The callbacks required in the "ex_data" hash table */
-static unsigned long ex_hash_cb(const void *a_void)
+static unsigned long ex_class_item_hash(const EX_CLASS_ITEM *a)
         {
-        return ((const EX_CLASS_ITEM *)a_void)->class_index;
+        return a->class_index;
         }
-static int ex_cmp_cb(const void *a_void, const void *b_void)
+static IMPLEMENT_LHASH_HASH_FN(ex_class_item, EX_CLASS_ITEM)
+
+static int ex_class_item_cmp(const EX_CLASS_ITEM *a, const EX_CLASS_ITEM *b)
         {
-        return (((const EX_CLASS_ITEM *)a_void)->class_index -
-                ((const EX_CLASS_ITEM *)b_void)->class_index);
+        return a->class_index - b->class_index;
         }
+static IMPLEMENT_LHASH_COMP_FN(ex_class_item, EX_CLASS_ITEM)
 
 /* Internal functions used by the "impl_default" implementation to access the
  * state */
 
 static int ex_data_check(void)
         {
         int toret = 1;
         CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
-        if(!ex_data && ((ex_data = lh_new(ex_hash_cb, ex_cmp_cb)) == NULL))
+        if(!ex_data
+           && (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
                 toret = 0;
         CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
         return toret;
         }
 /* This macros helps reduce the locking from repeated checks because the
  * ex_data_check() function checks ex_data again inside a lock. */
 #define EX_DATA_CHECK(iffail) if(!ex_data && !ex_data_check()) {iffail}
 
 /* This "inner" callback is used by the callback function that follows it */
 static void def_cleanup_util_cb(CRYPTO_EX_DATA_FUNCS *funcs)
@@ skipping 12 matching lines @@
         }
 
 /* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a
  * given class. Handles locking. */
 static EX_CLASS_ITEM *def_get_class(int class_index)
         {
         EX_CLASS_ITEM d, *p, *gen;
         EX_DATA_CHECK(return NULL;)
         d.class_index = class_index;
         CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
-        p = lh_retrieve(ex_data, &d);
+        p = lh_EX_CLASS_ITEM_retrieve(ex_data, &d);
         if(!p)
                 {
                 gen = OPENSSL_malloc(sizeof(EX_CLASS_ITEM));
                 if(gen)
                         {
                         gen->class_index = class_index;
                         gen->meth_num = 0;
                         gen->meth = sk_CRYPTO_EX_DATA_FUNCS_new_null();
                         if(!gen->meth)
                                 OPENSSL_free(gen);
                         else
                                 {
                                 /* Because we're inside the ex_data lock, the
                                  * return value from the insert will be NULL */
-                                lh_insert(ex_data, gen);
+                                (void)lh_EX_CLASS_ITEM_insert(ex_data, gen);
                                 p = gen;
                                 }
                         }
                 }
         CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
         if(!p)
                 CRYPTOerr(CRYPTO_F_DEF_GET_CLASS,ERR_R_MALLOC_FAILURE);
         return p;
         }
 
@@ skipping 41 matching lines @@
         int toret;
         CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
         toret = ex_class++;
         CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
         return toret;
         }
 
 static void int_cleanup(void)
         {
         EX_DATA_CHECK(return;)
-        lh_doall(ex_data, def_cleanup_cb);
-        lh_free(ex_data);
+        lh_EX_CLASS_ITEM_doall(ex_data, def_cleanup_cb);
+        lh_EX_CLASS_ITEM_free(ex_data);
         ex_data = NULL;
         impl = NULL;
         }
 
 static int int_get_new_index(int class_index, long argl, void *argp,
                 CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
                 CRYPTO_EX_free *free_func)
         {
         EX_CLASS_ITEM *item = def_get_class(class_index);
         if(!item)
@@ skipping 55 matching lines @@
         char *ptr;
         CRYPTO_EX_DATA_FUNCS **storage = NULL;
         EX_CLASS_ITEM *item;
         if(!from->sk)
                 /* 'to' should be "blank" which *is* just like 'from' */
                 return 1;
         if((item = def_get_class(class_index)) == NULL)
                 return 0;
         CRYPTO_r_lock(CRYPTO_LOCK_EX_DATA);
         mx = sk_CRYPTO_EX_DATA_FUNCS_num(item->meth);
-        j = sk_num(from->sk);
+        j = sk_void_num(from->sk);
         if(j < mx)
                 mx = j;
         if(mx > 0)
                 {
                 storage = OPENSSL_malloc(mx * sizeof(CRYPTO_EX_DATA_FUNCS*));
                 if(!storage)
                         goto skip;
                 for(i = 0; i < mx; i++)
                         storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth,i);
                 }
@@ skipping 50 matching lines @@
                         {
                         ptr = CRYPTO_get_ex_data(ad,i);
                         storage[i]->free_func(obj,ptr,ad,i,
                                 storage[i]->argl,storage[i]->argp);
                         }
                 }
         if(storage)
                 OPENSSL_free(storage);
         if(ad->sk)
                 {
-                sk_free(ad->sk);
+                sk_void_free(ad->sk);
                 ad->sk=NULL;
                 }
         }
 
 /********************************************************************/
 /* API functions that defer all "state" operations to the "ex_data"
  * implementation we have set. */
 
 /* Obtain an index for a new class (not the same as getting a new index within
  * an existing class - this is actually getting a new *class*) */
@@ skipping 52 matching lines @@
         }
 
 /* For a given CRYPTO_EX_DATA variable, set the value corresponding to a
  * particular index in the class used by this variable */
 int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
         {
         int i;
 
         if (ad->sk == NULL)
                 {
-                if ((ad->sk=sk_new_null()) == NULL)
+                if ((ad->sk=sk_void_new_null()) == NULL)
                         {
                         CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
                         return(0);
                         }
                 }
-        i=sk_num(ad->sk);
+        i=sk_void_num(ad->sk);
 
         while (i <= idx)
                 {
-                if (!sk_push(ad->sk,NULL))
+                if (!sk_void_push(ad->sk,NULL))
                         {
                         CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
                         return(0);
                         }
                 i++;
                 }
-        sk_set(ad->sk,idx,val);
+        sk_void_set(ad->sk,idx,val);
         return(1);
         }
 
 /* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a
  * particular index in the class used by this variable */
 void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
         {
         if (ad->sk == NULL)
                 return(0);
-        else if (idx >= sk_num(ad->sk))
+        else if (idx >= sk_void_num(ad->sk))
                 return(0);
         else
-                return(sk_value(ad->sk,idx));
+                return(sk_void_value(ad->sk,idx));
         }
 
 IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS)