summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-06-23 16:51:53 +0200
committerRichard Levitte <levitte@openssl.org>2001-06-23 16:51:53 +0200
commit20e8f0ee27430f46b0d26a53786e9af25366dcc9 (patch)
tree298482412738cd51fac2713db47c2ba0434fd651 /crypto
parentFix hwcrhk_insert_card. (diff)
downloadopenssl-20e8f0ee27430f46b0d26a53786e9af25366dcc9.tar.xz
openssl-20e8f0ee27430f46b0d26a53786e9af25366dcc9.zip
For the UI functions that return an int, 0 or any positive number is a
success return, any negative number is a failure. Make sure we check the return value with that in mind.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/engine/hw_ncipher.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
index b2af378960..b6403aa666 100644
--- a/crypto/engine/hw_ncipher.c
+++ b/crypto/engine/hw_ncipher.c
@@ -1211,7 +1211,7 @@ static int hwcrhk_insert_card(const char *prompt_info,
BIO_snprintf(buf, sizeof(buf)-1,
"Current card: \"%s\"\n", wrong_info);
ok = UI_dup_info_string(ui, buf);
- if (ok && prompt_info)
+ if (ok >= 0 && prompt_info)
{
BIO_snprintf(buf, sizeof(buf)-1,
"Insert card \"%s\"\n then hit <enter> or C<enter> to cancel\n", prompt_info);
@@ -1219,13 +1219,13 @@ static int hwcrhk_insert_card(const char *prompt_info,
answer, 0, sizeof(answer)-1);
}
UI_add_user_data(ui, callback_data);
- if (ok)
+ if (ok >= 0)
ok = UI_process(ui);
UI_free(ui);
/* If canceled input treat as 'cancel' */
if (ok == -2)
ok = 1;
- else if(ok != 0)
+ else if(ok < 0)
ok = -1;
else if (answer[0] == 'c' || answer[0] == 'C')
ok = 1;