diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-05-20 10:46:29 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-05-20 10:48:29 -0400 |
| commit | 739a1eb1961cdc3b1597a040766f3cb359d095f6 (patch) | |
| tree | da90e8dd33e1aa605351b529713901bb1b0f37b8 /crypto/objects | |
| parent | 06593767b21d4ebacc3e6ecc8daedd9d5c5f9f97 (diff) | |
Rename lh_xxx,sk_xxx tp OPENSSL_{LH,SK}_xxx
Rename sk_xxx to OPENSSL_sk_xxx and _STACK to OPENSSL_STACK
Rename lh_xxx API to OPENSSL_LH_xxx and LHASH_NODE to OPENSSL_LH_NODE
Make lhash stuff opaque.
Use typedefs for function pointers; makes the code simpler.
Remove CHECKED_xxx macros.
Add documentation; remove old X509-oriented doc.
Add API-compat names for entire old API
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/o_names.c | 4 | ||||
| -rw-r--r-- | crypto/objects/obj_dat.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 321a342846..e43fb30a76 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -99,7 +99,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE); return (0); } - name_funcs->hash_func = lh_strhash; + name_funcs->hash_func = OPENSSL_LH_strhash; name_funcs->cmp_func = obj_strcmp; CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); sk_NAME_FUNCS_push(name_funcs_stack, name_funcs); @@ -141,7 +141,7 @@ static unsigned long obj_name_hash(const OBJ_NAME *a) sk_NAME_FUNCS_value(name_funcs_stack, a->type)->hash_func(a->name); } else { - ret = lh_strhash(a->name); + ret = OPENSSL_LH_strhash(a->name); } ret ^= a->type; return (ret); diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 3b836fe6a5..46f98cb0ff 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -68,10 +68,10 @@ static unsigned long added_obj_hash(const ADDED_OBJ *ca) ret ^= p[i] << ((i * 3) % 24); break; case ADDED_SNAME: - ret = lh_strhash(a->sn); + ret = OPENSSL_LH_strhash(a->sn); break; case ADDED_LNAME: - ret = lh_strhash(a->ln); + ret = OPENSSL_LH_strhash(a->ln); break; case ADDED_NID: ret = a->nid; |