From 66cb29e64621fdd1aa5e377a395ff107d21a613b Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Thu, 29 Mar 2018 16:39:12 +0900 Subject: deps: upgrade openssl sources to 1.1.0h This updates all sources in deps/openssl/openssl with openssl-1.1.0h. Fixes: https://github.com/nodejs/node/issues/4270 PR-URL: https://github.com/nodejs/node/pull/19794 Reviewed-By: James M Snell Reviewed-By: Rod Vagg Reviewed-By: Michael Dawson --- deps/openssl/openssl/crypto/objects/o_names.c | 216 +++++++++++++++----------- 1 file changed, 128 insertions(+), 88 deletions(-) (limited to 'deps/openssl/openssl/crypto/objects/o_names.c') diff --git a/deps/openssl/openssl/crypto/objects/o_names.c b/deps/openssl/openssl/crypto/objects/o_names.c index b8bdc5c520..e06d5439f2 100644 --- a/deps/openssl/openssl/crypto/objects/o_names.c +++ b/deps/openssl/openssl/crypto/objects/o_names.c @@ -1,3 +1,12 @@ +/* + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #include #include #include @@ -7,35 +16,42 @@ #include #include #include +#include +#include "obj_lcl.h" /* - * Later versions of DEC C has started to add lnkage information to certain - * functions, which makes it tricky to use them as values to regular function - * pointers. One way is to define a macro that takes care of casting them - * correctly. + * We define this wrapper for two reasons. Firstly, later versions of + * DEC C add linkage information to certain functions, which makes it + * tricky to use them as values to regular function pointers. + * Secondly, in the EDK2 build environment, the strcmp function is + * actually an external function (AsciiStrCmp) with the Microsoft ABI, + * so we can't transparently assign function pointers to it. + * Arguably the latter is a stupidity of the UEFI environment, but + * since the wrapper solves the DEC C issue too, let's just use the + * same solution. */ -#ifdef OPENSSL_SYS_VMS_DECC -# define OPENSSL_strcmp (int (*)(const char *,const char *))strcmp +#if defined(OPENSSL_SYS_VMS_DECC) || defined(OPENSSL_SYS_UEFI) +static int obj_strcmp(const char *a, const char *b) +{ + return strcmp(a, b); +} #else -# define OPENSSL_strcmp strcmp +#define obj_strcmp strcmp #endif /* * I use the ex_data stuff to manage the identifiers for the obj_name_types * that applications may define. I only really use the free function field. */ -DECLARE_LHASH_OF(OBJ_NAME); static LHASH_OF(OBJ_NAME) *names_lh = NULL; static int names_type_num = OBJ_NAME_TYPE_NUM; +static CRYPTO_RWLOCK *lock = NULL; -typedef struct name_funcs_st { +struct name_funcs_st { unsigned long (*hash_func) (const char *name); int (*cmp_func) (const char *a, const char *b); void (*free_func) (const char *, int, const char *); -} NAME_FUNCS; - -DECLARE_STACK_OF(NAME_FUNCS) -IMPLEMENT_STACK_OF(NAME_FUNCS) +}; static STACK_OF(NAME_FUNCS) *name_funcs_stack; @@ -45,60 +61,69 @@ static STACK_OF(NAME_FUNCS) *name_funcs_stack; * casting without the need for macro-generated wrapper functions. */ -/* static unsigned long obj_name_hash(OBJ_NAME *a); */ -static unsigned long obj_name_hash(const void *a_void); -/* static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); */ -static int obj_name_cmp(const void *a_void, const void *b_void); +static unsigned long obj_name_hash(const OBJ_NAME *a); +static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b); -static IMPLEMENT_LHASH_HASH_FN(obj_name, OBJ_NAME) -static IMPLEMENT_LHASH_COMP_FN(obj_name, OBJ_NAME) +static CRYPTO_ONCE init = CRYPTO_ONCE_STATIC_INIT; +DEFINE_RUN_ONCE_STATIC(o_names_init) +{ + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); + names_lh = lh_OBJ_NAME_new(obj_name_hash, obj_name_cmp); + lock = CRYPTO_THREAD_lock_new(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); + return names_lh != NULL && lock != NULL; +} int OBJ_NAME_init(void) { - if (names_lh != NULL) - return (1); - MemCheck_off(); - names_lh = lh_OBJ_NAME_new(); - MemCheck_on(); - return (names_lh != NULL); + return RUN_ONCE(&init, o_names_init); } int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), int (*cmp_func) (const char *, const char *), void (*free_func) (const char *, int, const char *)) { - int ret; - int i; + int ret = 0, i, push; NAME_FUNCS *name_funcs; + if (!OBJ_NAME_init()) + return 0; + + CRYPTO_THREAD_write_lock(lock); + if (name_funcs_stack == NULL) { - MemCheck_off(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); name_funcs_stack = sk_NAME_FUNCS_new_null(); - MemCheck_on(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); } if (name_funcs_stack == NULL) { /* ERROR */ - return (0); + goto out; } ret = names_type_num; names_type_num++; for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) { - MemCheck_off(); - name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS)); - MemCheck_on(); - if (!name_funcs) { + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); + name_funcs = OPENSSL_zalloc(sizeof(*name_funcs)); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); + if (name_funcs == NULL) { + OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE); + ret = 0; + goto out; + } + name_funcs->hash_func = OPENSSL_LH_strhash; + name_funcs->cmp_func = obj_strcmp; + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); + + push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); + + if (!push) { OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE); - return (0); + OPENSSL_free(name_funcs); + ret = 0; + goto out; } - name_funcs->hash_func = lh_strhash; - name_funcs->cmp_func = OPENSSL_strcmp; - name_funcs->free_func = 0; /* NULL is often declared to * ((void - * *)0), which according * to Compaq C is - * not really * compatible with a function - * * pointer. -- Richard Levitte */ - MemCheck_off(); - sk_NAME_FUNCS_push(name_funcs_stack, name_funcs); - MemCheck_on(); } name_funcs = sk_NAME_FUNCS_value(name_funcs_stack, ret); if (hash_func != NULL) @@ -107,15 +132,15 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), name_funcs->cmp_func = cmp_func; if (free_func != NULL) name_funcs->free_func = free_func; - return (ret); + +out: + CRYPTO_THREAD_unlock(lock); + return ret; } -/* static int obj_name_cmp(OBJ_NAME *a, OBJ_NAME *b) */ -static int obj_name_cmp(const void *a_void, const void *b_void) +static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b) { int ret; - const OBJ_NAME *a = (const OBJ_NAME *)a_void; - const OBJ_NAME *b = (const OBJ_NAME *)b_void; ret = a->type - b->type; if (ret == 0) { @@ -126,14 +151,12 @@ static int obj_name_cmp(const void *a_void, const void *b_void) } else ret = strcmp(a->name, b->name); } - return (ret); + return ret; } -/* static unsigned long obj_name_hash(OBJ_NAME *a) */ -static unsigned long obj_name_hash(const void *a_void) +static unsigned long obj_name_hash(const OBJ_NAME *a) { unsigned long ret; - const OBJ_NAME *a = (const OBJ_NAME *)a_void; if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) { @@ -141,21 +164,23 @@ static unsigned long obj_name_hash(const void *a_void) 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); + return ret; } const char *OBJ_NAME_get(const char *name, int type) { OBJ_NAME on, *ret; int num = 0, alias; + const char *value = NULL; if (name == NULL) - return (NULL); - if ((names_lh == NULL) && !OBJ_NAME_init()) - return (NULL); + return NULL; + if (!OBJ_NAME_init()) + return NULL; + CRYPTO_THREAD_read_lock(lock); alias = type & OBJ_NAME_ALIAS; type &= ~OBJ_NAME_ALIAS; @@ -166,32 +191,38 @@ const char *OBJ_NAME_get(const char *name, int type) for (;;) { ret = lh_OBJ_NAME_retrieve(names_lh, &on); if (ret == NULL) - return (NULL); + break; if ((ret->alias) && !alias) { if (++num > 10) - return (NULL); + break; on.name = ret->data; } else { - return (ret->data); + value = ret->data; + break; } } + + CRYPTO_THREAD_unlock(lock); + return value; } int OBJ_NAME_add(const char *name, int type, const char *data) { OBJ_NAME *onp, *ret; - int alias; + int alias, ok = 0; + + if (!OBJ_NAME_init()) + return 0; - if ((names_lh == NULL) && !OBJ_NAME_init()) - return (0); + CRYPTO_THREAD_write_lock(lock); alias = type & OBJ_NAME_ALIAS; type &= ~OBJ_NAME_ALIAS; - onp = (OBJ_NAME *)OPENSSL_malloc(sizeof(OBJ_NAME)); + onp = OPENSSL_malloc(sizeof(*onp)); if (onp == NULL) { /* ERROR */ - return 0; + goto unlock; } onp->name = name; @@ -217,18 +248,26 @@ int OBJ_NAME_add(const char *name, int type, const char *data) if (lh_OBJ_NAME_error(names_lh)) { /* ERROR */ OPENSSL_free(onp); - return 0; + goto unlock; } } - return 1; + + ok = 1; + +unlock: + CRYPTO_THREAD_unlock(lock); + return ok; } int OBJ_NAME_remove(const char *name, int type) { OBJ_NAME on, *ret; + int ok = 0; - if (names_lh == NULL) - return (0); + if (!OBJ_NAME_init()) + return 0; + + CRYPTO_THREAD_write_lock(lock); type &= ~OBJ_NAME_ALIAS; on.name = name; @@ -247,36 +286,37 @@ int OBJ_NAME_remove(const char *name, int type) ret->data); } OPENSSL_free(ret); - return (1); - } else - return (0); + ok = 1; + } + + CRYPTO_THREAD_unlock(lock); + return ok; } -struct doall { +typedef struct { int type; void (*fn) (const OBJ_NAME *, void *arg); void *arg; -}; +} OBJ_DOALL; -static void do_all_fn_doall_arg(const OBJ_NAME *name, struct doall *d) +static void do_all_fn(const OBJ_NAME *name, OBJ_DOALL *d) { if (name->type == d->type) d->fn(name, d->arg); } -static IMPLEMENT_LHASH_DOALL_ARG_FN(do_all_fn, const OBJ_NAME, struct doall) +IMPLEMENT_LHASH_DOALL_ARG_CONST(OBJ_NAME, OBJ_DOALL); void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg), void *arg) { - struct doall d; + OBJ_DOALL d; d.type = type; d.fn = fn; d.arg = arg; - lh_OBJ_NAME_doall_arg(names_lh, LHASH_DOALL_ARG_FN(do_all_fn), - struct doall, &d); + lh_OBJ_NAME_doall_OBJ_DOALL(names_lh, do_all_fn, &d); } struct doall_sorted { @@ -312,9 +352,9 @@ void OBJ_NAME_do_all_sorted(int type, d.type = type; d.names = - OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof(*d.names)); + OPENSSL_malloc(sizeof(*d.names) * lh_OBJ_NAME_num_items(names_lh)); /* Really should return an error if !d.names...but its a void function! */ - if (d.names) { + if (d.names != NULL) { d.n = 0; OBJ_NAME_do_all(type, do_all_sorted_fn, &d); @@ -338,8 +378,6 @@ static void names_lh_free_doall(OBJ_NAME *onp) OBJ_NAME_remove(onp->name, onp->type); } -static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME) - static void name_funcs_free(NAME_FUNCS *ptr) { OPENSSL_free(ptr); @@ -353,15 +391,17 @@ void OBJ_NAME_cleanup(int type) return; free_type = type; - down_load = lh_OBJ_NAME_down_load(names_lh); - lh_OBJ_NAME_down_load(names_lh) = 0; + down_load = lh_OBJ_NAME_get_down_load(names_lh); + lh_OBJ_NAME_set_down_load(names_lh, 0); - lh_OBJ_NAME_doall(names_lh, LHASH_DOALL_FN(names_lh_free)); + lh_OBJ_NAME_doall(names_lh, names_lh_free_doall); if (type < 0) { lh_OBJ_NAME_free(names_lh); sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free); + CRYPTO_THREAD_lock_free(lock); names_lh = NULL; name_funcs_stack = NULL; + lock = NULL; } else - lh_OBJ_NAME_down_load(names_lh) = down_load; + lh_OBJ_NAME_set_down_load(names_lh, down_load); } -- cgit v1.2.3