[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  2a600d7afd55ed71076e9c41469f6bba72d1f313 (commit)
      from  febb096c4c5d927c3f48f22adce64839721e79dc (commit)


- Log -----------------------------------------------------------------
commit 2a600d7afd55ed71076e9c41469f6bba72d1f313
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Aug 1 13:07:48 2016 +0200

    Fix return values of do_passwd() in apps/passwd.c
    
    do_passwd() was returning 0 on success and 1 on failure.  However,
    those values were interpreted the other way around.  The fix that
    makes the most sense is to change what do_passwd() returns.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/passwd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/passwd.c b/apps/passwd.c
index 31c4eef..e2c9096 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -496,10 +496,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
         BIO_printf(out, "%s\t%s\n", hash, passwd);
     else
         BIO_printf(out, "%s\n", hash);
-    return 0;
+    return 1;
 
  end:
-    return 1;
+    return 0;
 }
 #else