From b335abd946bfc1746f9f8134db54129db2e43354 Mon Sep 17 00:00:00 2001
From: martingd <728722+martingd@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:01:08 +0100
Subject: [PATCH] Error from argon2_hash() during verify propagated. (#1039)

---
 src/libsodium/crypto_pwhash/argon2/argon2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsodium/crypto_pwhash/argon2/argon2.c b/src/libsodium/crypto_pwhash/argon2/argon2.c
index 5912f7fc..4d69f117 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2.c
@@ -261,7 +261,7 @@ argon2_verify(const char *encoded, const void *pwd, const size_t pwdlen,
     free(ctx.ad);
     free(ctx.salt);
 
-    if (ret != ARGON2_OK || sodium_memcmp(out, ctx.out, ctx.outlen) != 0) {
+    if (ret == ARGON2_OK && sodium_memcmp(out, ctx.out, ctx.outlen) != 0) {
         ret = ARGON2_VERIFY_MISMATCH;
     }
     free(out);