From 0a647c2b8b52479867c15584d6e72cbbfcc4459d Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 13 May 2001 05:34:39 +0000 Subject: [PATCH] Define `ok' and better error detection. --- crypto/ui/ui_compat.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/crypto/ui/ui_compat.c b/crypto/ui/ui_compat.c index fd8e004c10..6938d72d49 100644 --- a/crypto/ui/ui_compat.c +++ b/crypto/ui/ui_compat.c @@ -98,13 +98,19 @@ int des_read_pw_string(char *buf,int length,const char *prompt,int verify) int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify) { + int ok = 0; UI *ui; ui = UI_new(); - UI_add_input_string(ui,prompt,0,buf,0,BUFSIZ-1); - if (verify) - UI_add_verify_string(ui,prompt,0,buff,0,BUFSIZ-1,buf); - ok=UI_process(ui); - UI_free(ui); + if (ui) + { + ok = UI_add_input_string(ui,prompt,0,buf,0,BUFSIZ-1); + if (ok == 0 && verify) + ok = UI_add_verify_string(ui,prompt,0,buff,0,BUFSIZ-1, + buf); + if (ok == 0) + ok=UI_process(ui); + UI_free(ui); + } return(ok); } -- 2.34.1