public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize ossl_namemap_name2num_n to avoid strndup

Browse source 
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26870)
This commit is contained in:
Andrew Dinh 2025-02-21 23:55:58 +07:00 • committed by Neil Horman
parent 18f2091ad1
commit 054f6c0fc1
2 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crypto/core_namemap.c
View file

@ -163,19 +163,31 @@ int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name)
return number;
}
/* TODO: Optimize to avoid strndup() */
int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
const char *name, size_t name_len)
{
char *tmp;
int ret;
int number = 0;
HT_VALUE *val;
NAMENUM_KEY key;
if (name == NULL || (tmp = OPENSSL_strndup(name, name_len)) == NULL)
#ifndef FIPS_MODULE
if (namemap == NULL)
namemap = ossl_namemap_stored(NULL);
#endif
if (namemap == NULL)
return 0;
ret = ossl_namemap_name2num(namemap, tmp);
OPENSSL_free(tmp);
return ret;
HT_INIT_KEY(&key);
HT_SET_KEY_STRING_CASE_N(&key, name, name, name_len);
val = ossl_ht_get(namemap->namenum_ht, TO_HT_KEY(&key));
if (val != NULL)
/* We store a (small) int directly instead of a pointer to it. */
number = (int)(intptr_t)val->value;
return number;
}
const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,

20
include/internal/hashtable.h
View file

@ -139,6 +139,26 @@ memset((key), 0, sizeof(*(key))); \
ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) -1); \
} while(0)
/*
* Same as HT_SET_KEY_STRING but also takes length of the string.
*/
#define HT_SET_KEY_STRING_N(key, member, value, len) do { \
if ((value) != NULL) { \
if (len < sizeof((key)->keyfields.member)) \
strncpy((key)->keyfields.member, value, len); \
else \
strncpy((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
} \
} while(0)
/* Same as HT_SET_KEY_STRING_CASE but also takes length of the string. */
#define HT_SET_KEY_STRING_CASE_N(key, member, value, len) do { \
if (len < sizeof((key)->keyfields.member)) \
ossl_ht_strcase((key)->keyfields.member, value, len); \
else \
ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
} while(0)
/*
* Sets a uint8_t (blob) field in a hash table key
*/