From: Richard Levitte <levitte@openssl.org>
Date: Tue, 13 Sep 2016 20:48:35 +0000 (+0200)
Subject: Fix 'openssl passwd' with arguments -1 or -apr1
X-Git-Tag: OpenSSL_1_1_0a~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9fd47a037079f33ca3b71c32fb4a86397e0bfcd1;p=oweals%2Fopenssl.git

Fix 'openssl passwd' with arguments -1 or -apr1

RT#4674

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 9f9f962d96425ed741569460791eee0280fcf942)
---

diff --git a/apps/passwd.c b/apps/passwd.c
index e2c90960e5..a45245cd7f 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -319,6 +319,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         || !EVP_DigestUpdate(md, magic, magic_len)
         || !EVP_DigestUpdate(md, "$", 1)
         || !EVP_DigestUpdate(md, salt_out, salt_len))
+        goto err;
 
     md2 = EVP_MD_CTX_new();
     if (md2 == NULL