diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-01-13 11:19:48 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-01-13 11:47:35 +0100 |
| commit | 37cbabbdb8c701a4d29c448cf6994fe154f43afa (patch) | |
| tree | 68343b53770d22fcd5cc6527b728358db90113f5 /crypto/ui | |
| parent | 7eb26c4936898b165c88d1dcadfa22d34cb25d15 (diff) | |
UI: Use RUN_ONCE differently
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2222)
Diffstat (limited to 'crypto/ui')
| -rw-r--r-- | crypto/ui/ui_util.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c index 9e2752712c..67b2ec2229 100644 --- a/crypto/ui/ui_util.c +++ b/crypto/ui/ui_util.c @@ -85,11 +85,14 @@ static void ui_free_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad, } static CRYPTO_ONCE get_index_once = CRYPTO_ONCE_STATIC_INIT; -DEFINE_RUN_ONCE_STATIC(ui_method_data_index) +static int ui_method_data_index = -1; +DEFINE_RUN_ONCE_STATIC(ui_method_data_index_init) { - return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD, 0, NULL, - ui_new_method_data, ui_dup_method_data, - ui_free_method_data); + ui_method_data_index = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD, + 0, NULL, ui_new_method_data, + ui_dup_method_data, + ui_free_method_data); + return 1; } static int ui_open(UI *ui) @@ -103,9 +106,7 @@ static int ui_read(UI *ui, UI_STRING *uis) { char result[PEM_BUFSIZE]; const struct pem_password_cb_data *data = - UI_method_get_ex_data(UI_get_method(ui), - RUN_ONCE(&get_index_once, - ui_method_data_index)); + UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index); int maxsize = UI_get_result_maxsize(uis); int len = data->cb(result, maxsize > PEM_BUFSIZE ? PEM_BUFSIZE : maxsize, @@ -139,7 +140,6 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag) { struct pem_password_cb_data *data = NULL; UI_METHOD *ui_method = NULL; - int idx = 0; if ((data = OPENSSL_zalloc(sizeof(*data))) == NULL || (ui_method = UI_create_method("PEM password callback wrapper")) == NULL @@ -147,8 +147,8 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag) || UI_method_set_reader(ui_method, ui_read) < 0 || UI_method_set_writer(ui_method, ui_write) < 0 || UI_method_set_closer(ui_method, ui_close) < 0 - || (idx = RUN_ONCE(&get_index_once, ui_method_data_index)) <= 0 - || UI_method_set_ex_data(ui_method, idx, data) < 0) { + || !RUN_ONCE(&get_index_once, ui_method_data_index_init) + || UI_method_set_ex_data(ui_method, ui_method_data_index, data) < 0) { UI_destroy_method(ui_method); OPENSSL_free(data); return NULL; |