[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5e44201bc5b027d3d4e2f8904719fd69ed47e515 (commit)
      from  274d1beea2ffff23a469a978658a83e03e46f80f (commit)


- Log -----------------------------------------------------------------
commit 5e44201bc5b027d3d4e2f8904719fd69ed47e515
Author: Aashil Patel <aashilpatel1993 at gmail.com>
Date:   Wed May 31 20:05:14 2017 -0400

    Remove unnecessary if condition from apps.c
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3596)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index c66b89c..1a1b7ec 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -301,9 +301,9 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
         /* We know that there is no previous user data to return to us */
         (void)UI_add_user_data(ui, cb_data);
 
-        if (ok >= 0)
-            ok = UI_add_input_string(ui, prompt, ui_flags, buf,
-                                     PW_MIN_LENGTH, bufsiz - 1);
+        ok = UI_add_input_string(ui, prompt, ui_flags, buf,
+                                 PW_MIN_LENGTH, bufsiz - 1);
+
         if (ok >= 0 && verify) {
             buff = app_malloc(bufsiz, "password buffer");
             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,