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

openssl/crypto/asn1/a_strnid.c

 /* a_strnid.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 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 49 matching lines @@
 #include <ctype.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 
 
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
 static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
                         const ASN1_STRING_TABLE * const *b);
-static int table_cmp(const void *a, const void *b);
 
 
 /* This is the global mask for the mbstring functions: this is use to
  * mask out certain types (such as BMPString and UTF8String) because
  * certain software (e.g. Netscape) has problems with them.
  */
 
 static unsigned long global_mask = 0xFFFFFFFFL;
 
 void ASN1_STRING_set_default_mask(unsigned long mask)
 {
         global_mask = mask;
 }
 
 unsigned long ASN1_STRING_get_default_mask(void)
 {
         return global_mask;
 }
 
 /* This function sets the default to various "flavours" of configuration.
  * based on an ASCII string. Currently this is:
  * MASK:XXXX : a numerical mask value.
  * nobmp : Don't use BMPStrings (just Printable, T61).
  * pkix : PKIX recommendation in RFC2459.
  * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004).
  * default:   the default value, Printable, T61, BMP.
  */
 
-int ASN1_STRING_set_default_mask_asc(char *p)
+int ASN1_STRING_set_default_mask_asc(const char *p)
 {
         unsigned long mask;
         char *end;
         if(!strncmp(p, "MASK:", 5)) {
                 if(!p[5]) return 0;
                 mask = strtoul(p + 5, &end, 0);
                 if(*end) return 0;
         } else if(!strcmp(p, "nombstr"))
                          mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));
         else if(!strcmp(p, "pkix"))
@@ skipping 41 matching lines @@
 #define ub_state_name                   128
 #define ub_organization_name            64
 #define ub_organization_unit_name       64
 #define ub_title                        64
 #define ub_email_address                128
 #define ub_serial_number                64
 
 
 /* This table must be kept in NID order */
 
-static ASN1_STRING_TABLE tbl_standard[] = {
+static const ASN1_STRING_TABLE tbl_standard[] = {
 {NID_commonName,                1, ub_common_name, DIRSTRING_TYPE, 0},
 {NID_countryName,               2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
 {NID_localityName,              1, ub_locality_name, DIRSTRING_TYPE, 0},
 {NID_stateOrProvinceName,       1, ub_state_name, DIRSTRING_TYPE, 0},
 {NID_organizationName,          1, ub_organization_name, DIRSTRING_TYPE, 0},
 {NID_organizationalUnitName,    1, ub_organization_unit_name, DIRSTRING_TYPE, 0},
 {NID_pkcs9_emailAddress,        1, ub_email_address, B_ASN1_IA5STRING, STABLE_NO_MASK},
 {NID_pkcs9_unstructuredName,    1, -1, PKCS9STRING_TYPE, 0},
 {NID_pkcs9_challengePassword,   1, -1, PKCS9STRING_TYPE, 0},
 {NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0},
 {NID_givenName,                 1, ub_name, DIRSTRING_TYPE, 0},
 {NID_surname,                   1, ub_name, DIRSTRING_TYPE, 0},
 {NID_initials,                  1, ub_name, DIRSTRING_TYPE, 0},
 {NID_serialNumber,              1, ub_serial_number, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
 {NID_friendlyName,              -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
 {NID_name,                      1, ub_name, DIRSTRING_TYPE, 0},
 {NID_dnQualifier,               -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
 {NID_domainComponent,           1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
 {NID_ms_csp_name,               -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
 };
 
 static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
                         const ASN1_STRING_TABLE * const *b)
 {
         return (*a)->nid - (*b)->nid;
 }
 
-static int table_cmp(const void *a, const void *b)
+DECLARE_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
+
+static int table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b)
 {
-        const ASN1_STRING_TABLE *sa = a, *sb = b;
-        return sa->nid - sb->nid;
+        return a->nid - b->nid;
 }
 
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
+
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
 {
         int idx;
         ASN1_STRING_TABLE *ttmp;
         ASN1_STRING_TABLE fnd;
         fnd.nid = nid;
-        ttmp = (ASN1_STRING_TABLE *) OBJ_bsearch((char *)&fnd,
-                                        (char *)tbl_standard, 
-                        sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE),
-                        sizeof(ASN1_STRING_TABLE), table_cmp);
+        ttmp = OBJ_bsearch_table(&fnd, tbl_standard, 
+                           sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE));
         if(ttmp) return ttmp;
         if(!stable) return NULL;
         idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
         if(idx < 0) return NULL;
         return sk_ASN1_STRING_TABLE_value(stable, idx);
 }
         
 int ASN1_STRING_TABLE_add(int nid,
                  long minsize, long maxsize, unsigned long mask,
                                 unsigned long flags)
@@ skipping 66 matching lines @@
                 }
 
         for (tmp = tbl_standard, i = 0;
                 i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)
                         printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,
                                                         OBJ_nid2ln(tmp->nid));
 
 }
 
 #endif