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

openssl/crypto/store/str_lib.c

 /* crypto/store/str_lib.c -*- mode:C; c-file-style: "eay" -*- */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2003.
  */
 /* ====================================================================
  * Copyright (c) 2003 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 1652 matching lines @@
 
         if (context && context->attributes)
                 {
                 return context->attributes->code == STORE_ATTR_END;
                 }
         STOREerr(STORE_F_STORE_PARSE_ATTRS_ENDP, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
         }
 
 static int attr_info_compare_compute_range(
-        unsigned char *abits, unsigned char *bbits,
+        const unsigned char *abits, const unsigned char *bbits,
         unsigned int *alowp, unsigned int *ahighp,
         unsigned int *blowp, unsigned int *bhighp)
         {
         unsigned int alow = (unsigned int)-1, ahigh = 0;
         unsigned int blow = (unsigned int)-1, bhigh = 0;
         int i, res = 0;
 
         for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
                 {
                 if (res == 0)
@@ skipping 48 matching lines @@
                 }
         if (ahigh + alow < bhigh + blow) res = -1;
         if (ahigh + alow > bhigh + blow) res = 1;
         if (alowp) *alowp = alow;
         if (ahighp) *ahighp = ahigh;
         if (blowp) *blowp = blow;
         if (bhighp) *bhighp = bhigh;
         return res;
         }
 
-int STORE_ATTR_INFO_compare(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a,
+                            const STORE_ATTR_INFO * const *b)
         {
         if (a == b) return 0;
         if (!a) return -1;
         if (!b) return 1;
-        return attr_info_compare_compute_range(a->set, b->set, 0, 0, 0, 0);
+        return attr_info_compare_compute_range((*a)->set, (*b)->set, 0, 0, 0, 0);
         }
+
 int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
         {
         unsigned int alow, ahigh, blow, bhigh;
 
         if (a == b) return 1;
         if (!a) return 0;
         if (!b) return 0;
         attr_info_compare_compute_range(a->set, b->set,
                 &alow, &ahigh, &blow, &bhigh);
         if (alow >= blow && ahigh <= bhigh)
                 return 1;
         return 0;
         }
+
 int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
         {
         unsigned char *abits, *bbits;
         int i;
 
         if (a == b) return 1;
         if (!a) return 0;
         if (!b) return 0;
         abits = a->set;
         bbits = b->set;
         for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
                 {
                 if (*abits && (*bbits & *abits) != *abits)
                         return 0;
                 }
         return 1;
         }
+
 int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
         {
         STORE_ATTR_TYPES i;
 
         if (a == b) return 1;
         if (!STORE_ATTR_INFO_in(a, b)) return 0;
         for (i = 1; i < STORE_ATTR_TYPE_NUM; i++)
                 if (ATTR_IS_SET(a, i))
                         {
                         switch(i)
@@ skipping 26 matching lines @@
                                             b->values[i].number))
                                         return 0;
                                 break;
                         default:
                                 break;
                                 }
                         }
 
         return 1;
         }