Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18341)
+/* This function is not thread safe, the namemap must be locked */
static int namemap_name2num(const OSSL_NAMEMAP *namemap,
const char *name)
{
static int namemap_name2num(const OSSL_NAMEMAP *namemap,
const char *name)
{
-static int namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
- const char *name, size_t name_len)
+/* This function is not thread safe, the namemap must be locked */
+static int namemap_add_name(OSSL_NAMEMAP *namemap, int number,
+ const char *name)
{
NAMENUM_ENTRY *namenum = NULL;
int tmp_number;
{
NAMENUM_ENTRY *namenum = NULL;
int tmp_number;
- char *tmp = OPENSSL_strndup(name, name_len);
-
- if (tmp == NULL)
- return 0;
/* If it already exists, we don't add it */
/* If it already exists, we don't add it */
- if ((tmp_number = namemap_name2num(namemap, tmp)) != 0) {
- OPENSSL_free(tmp);
+ if ((tmp_number = namemap_name2num(namemap, name)) != 0)
if ((namenum = OPENSSL_zalloc(sizeof(*namenum))) == NULL)
if ((namenum = OPENSSL_zalloc(sizeof(*namenum))) == NULL)
+ return 0;
+
+ if ((namenum->name = OPENSSL_strdup(name)) == NULL)
/* The tsan_counter use here is safe since we're under lock */
namenum->number =
/* The tsan_counter use here is safe since we're under lock */
namenum->number =
return namenum->number;
err:
return namenum->number;
err:
- OPENSSL_free(tmp);
- OPENSSL_free(namenum);
-int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
- const char *name, size_t name_len)
+int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number,
+ const char *name)
namemap = ossl_namemap_stored(NULL);
#endif
namemap = ossl_namemap_stored(NULL);
#endif
- if (name == NULL || name_len == 0 || namemap == NULL)
+ if (name == NULL || *name == 0 || namemap == NULL)
return 0;
if (!CRYPTO_THREAD_write_lock(namemap->lock))
return 0;
return 0;
if (!CRYPTO_THREAD_write_lock(namemap->lock))
return 0;
- tmp_number = namemap_add_name_n(namemap, number, name, name_len);
+ tmp_number = namemap_add_name(namemap, number, name);
CRYPTO_THREAD_unlock(namemap->lock);
return tmp_number;
}
CRYPTO_THREAD_unlock(namemap->lock);
return tmp_number;
}
-int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name)
-{
- if (name == NULL)
- return 0;
-
- return ossl_namemap_add_name_n(namemap, number, name, strlen(name));
-}
-
int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
const char *names, const char separator)
{
int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
const char *names, const char separator)
{
- const char *p, *q;
- size_t l;
+ char *tmp, *p, *q, *endp;
/* Check that we have a namemap */
if (!ossl_assert(namemap != NULL)) {
/* Check that we have a namemap */
if (!ossl_assert(namemap != NULL)) {
- if (!CRYPTO_THREAD_write_lock(namemap->lock))
+ if ((tmp = OPENSSL_strdup(names)) == NULL)
+
+ if (!CRYPTO_THREAD_write_lock(namemap->lock)) {
+ OPENSSL_free(tmp);
+ return 0;
+ }
/*
* Check that no name is an empty string, and that all names have at
* most one numeric identity together.
*/
/*
* Check that no name is an empty string, and that all names have at
* most one numeric identity together.
*/
- for (p = names; *p != '\0'; p = (q == NULL ? p + l : q + 1)) {
+ for (p = tmp; *p != '\0'; p = q) {
- char *allocated;
- const char *tmp;
if ((q = strchr(p, separator)) == NULL) {
l = strlen(p); /* offset to \0 */
if ((q = strchr(p, separator)) == NULL) {
l = strlen(p); /* offset to \0 */
- tmp = p;
- allocated = NULL;
} else {
l = q - p; /* offset to the next separator */
} else {
l = q - p; /* offset to the next separator */
- tmp = allocated = OPENSSL_strndup(p, l);
- if (tmp == NULL)
- goto err;
- this_number = namemap_name2num(namemap, tmp);
- OPENSSL_free(allocated);
-
- if (*p == '\0' || *p == separator) {
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_BAD_ALGORITHM_NAME);
ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_BAD_ALGORITHM_NAME);
+ number = 0;
+ goto end;
+
+ this_number = namemap_name2num(namemap, p);
+
if (number == 0) {
number = this_number;
} else if (this_number != 0 && this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_CONFLICTING_NAMES,
if (number == 0) {
number = this_number;
} else if (this_number != 0 && this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_CONFLICTING_NAMES,
- "\"%.*s\" has an existing different identity %d (from \"%s\")",
- l, p, this_number, names);
- goto err;
+ "\"%s\" has an existing different identity %d (from \"%s\")",
+ p, this_number, names);
+ number = 0;
+ goto end;
/* Now that we have checked, register all names */
/* Now that we have checked, register all names */
- for (p = names; *p != '\0'; p = (q == NULL ? p + l : q + 1)) {
+ for (p = tmp; p < endp; p = q) {
- if ((q = strchr(p, separator)) == NULL)
- l = strlen(p); /* offset to \0 */
- else
- l = q - p; /* offset to the next separator */
- this_number = namemap_add_name_n(namemap, number, p, l);
+ this_number = namemap_add_name(namemap, number, p);
if (number == 0) {
number = this_number;
} else if (this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
"Got number %d when expecting %d",
this_number, number);
if (number == 0) {
number = this_number;
} else if (this_number != number) {
ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
"Got number %d when expecting %d",
this_number, number);
+ number = 0;
+ goto end;
CRYPTO_THREAD_unlock(namemap->lock);
CRYPTO_THREAD_unlock(namemap->lock);
-
- err:
- CRYPTO_THREAD_unlock(namemap->lock);
- return 0;
=head1 NAME
ossl_namemap_new, ossl_namemap_free, ossl_namemap_stored, ossl_namemap_empty,
=head1 NAME
ossl_namemap_new, ossl_namemap_free, ossl_namemap_stored, ossl_namemap_empty,
-ossl_namemap_add_name, ossl_namemap_add_name_n, ossl_namemap_add_names,
+ossl_namemap_add_name, ossl_namemap_add_names,
ossl_namemap_name2num, ossl_namemap_name2num_n,
ossl_namemap_doall_names
- internal number E<lt>-E<gt> name map
ossl_namemap_name2num, ossl_namemap_name2num_n,
ossl_namemap_doall_names
- internal number E<lt>-E<gt> name map
int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
- int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
- const char *name, size_t name_len);
int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name);
int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name);
int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
ossl_namemap_name2num() finds the number corresponding to the given
I<name>.
ossl_namemap_name2num() finds the number corresponding to the given
I<name>.
-ossl_namemap_add_name_n() and ossl_namemap_name2num_n() do the same thing
-as ossl_namemap_add_name() and ossl_namemap_name2num(), but take a string
-length I<name_len> as well, allowing the caller to use a fragment of
-a string as a name.
+ossl_namemap_name2num_n() does the same thing as
+ossl_namemap_name2num(), but takes a string length I<name_len> as well,
+allowing the caller to use a fragment of a string as a name.
ossl_namemap_doall_names() walks through all names associated with
I<number> in the given I<namemap> and calls the function I<fn> for
ossl_namemap_doall_names() walks through all names associated with
I<number> in the given I<namemap> and calls the function I<fn> for
empty, 0 if it's not empty, or -1 on internal error (such as inability
to lock).
empty, 0 if it's not empty, or -1 on internal error (such as inability
to lock).
-ossl_namemap_add_name() and ossl_namemap_add_name_n() return the number
-associated with the added string, or zero on error.
+ossl_namemap_add_name() returns the number associated with the added
+string, or zero on error.
ossl_namemap_num2names() returns a pointer to a NULL-terminated list of
pointers to the names corresponding to the given number, or NULL if
ossl_namemap_num2names() returns a pointer to a NULL-terminated list of
pointers to the names corresponding to the given number, or NULL if
int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
-int ossl_namemap_add_name_n(OSSL_NAMEMAP *namemap, int number,
- const char *name, size_t name_len);
/*
* The number<->name relationship is 1<->many
/*
* The number<->name relationship is 1<->many