*/
#include <string.h>
+#include "internal/thread_once.h"
#include "ui_locl.h"
#ifndef BUFSIZ
OPENSSL_free(ptr);
}
-static int ui_method_data_index()
+static CRYPTO_ONCE get_index_once = CRYPTO_ONCE_STATIC_INIT;
+static int ui_method_data_index = -1;
+DEFINE_RUN_ONCE_STATIC(ui_method_data_index_init)
{
- static int idx = -1;
-
- if (idx == -1)
- idx = 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 idx;
+ 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)
switch (UI_get_string_type(uis)) {
case UIT_PROMPT:
{
- char result[PEM_BUFSIZE];
+ char result[PEM_BUFSIZE + 1];
const struct pem_password_cb_data *data =
- UI_method_get_ex_data(UI_get_method(ui),
- 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,
data->rwflag, UI_get0_user_data(ui));
+ if (len >= 0)
+ result[len] = '\0';
if (len <= 0)
return len;
- if (UI_set_result(ui, uis, result) >= 0)
+ if (UI_set_result_ex(ui, uis, result, len) >= 0)
return 1;
return 0;
}
|| 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
- || UI_method_set_ex_data(ui_method, ui_method_data_index(), 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;