diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-02-29 17:12:25 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 11:10:34 -0500 |
| commit | 41cfbccc99f3ca3c9f656d8c71e2db5bcfcf6817 (patch) | |
| tree | 900c46e5cd1506da790f8f49404bcb518a96e1c8 /crypto/ui/ui_openssl.c | |
| parent | 9b398ef297dd1b74527dd0afee9f59cd3f5bc33d (diff) | |
Convert CRYPTO_LOCK_UI to new multi-threading API
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/ui/ui_openssl.c')
| -rw-r--r-- | crypto/ui/ui_openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 9b4786b3b5..9a4870803e 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -462,7 +462,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) /* Internal functions to open, handle and close a channel to the console. */ static int open_console(UI *ui) { - CRYPTO_w_lock(CRYPTO_LOCK_UI); + CRYPTO_THREAD_write_lock(ui->lock); is_a_tty = 1; #if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) @@ -569,7 +569,7 @@ static int close_console(UI *ui) #ifdef OPENSSL_SYS_VMS status = sys$dassgn(channel); #endif - CRYPTO_w_unlock(CRYPTO_LOCK_UI); + CRYPTO_THREAD_unlock(ui->lock); return 1; } |