[openssl] master update

[tomas]

The branch master has been updated
       via  ea4d16bc60dee53feb71997c1e78379eeb69b7ac (commit)
      from  abc4345a19430869b9a8925c6defc9e9ce977429 (commit)


- Log -----------------------------------------------------------------
commit ea4d16bc60dee53feb71997c1e78379eeb69b7ac
Author: Peiwei Hu <jlu....@foxmail.com>
Date:   Tue Jan 4 09:10:32 2022 +0800

    apps/passwd.c: free before error exiting
    
    use goto instead of returning directly while error handling
    
    Signed-off-by: Peiwei Hu <jlu....@foxmail.com>
    
    Reviewed-by: Ben Kaduk <ka...@mit.edu>
    Reviewed-by: Paul Dale <pa...@openssl.org>
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17404)

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

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

diff --git a/apps/passwd.c b/apps/passwd.c
index bcb8804114..e024e8de7e 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -410,7 +410,7 @@ static char *md5crypt(const char *passwd, const char 
*magic, const char *salt)
         n >>= 1;
     }
     if (!EVP_DigestFinal_ex(md, buf, NULL))
-        return NULL;
+        goto err;
 
     for (i = 0; i < 1000; i++) {
         if (!EVP_DigestInit_ex(md2, EVP_md5(), NULL))
@@ -636,7 +636,7 @@ static char *shacrypt(const char *passwd, const char 
*magic, const char *salt)
         n >>= 1;
     }
     if (!EVP_DigestFinal_ex(md, buf, NULL))
-        return NULL;
+        goto err;
 
     /* P sequence */
     if (!EVP_DigestInit_ex(md2, sha, NULL))
@@ -647,7 +647,7 @@ static char *shacrypt(const char *passwd, const char 
*magic, const char *salt)
             goto err;
 
     if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
-        return NULL;
+        goto err;
 
     if ((p_bytes = OPENSSL_zalloc(passwd_len)) == NULL)
         goto err;
@@ -664,7 +664,7 @@ static char *shacrypt(const char *passwd, const char 
*magic, const char *salt)
             goto err;
 
     if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
-        return NULL;
+        goto err;
 
     if ((s_bytes = OPENSSL_zalloc(salt_len)) == NULL)
         goto err;