[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  5811387bac39cdb6d009dc0139b56e6896259cbd (commit)
      from  5053394aa6bc989e1ce8f0e47578c691aee6aa47 (commit)


- Log -----------------------------------------------------------------
commit 5811387bac39cdb6d009dc0139b56e6896259cbd
Author: Ankita Shetty <ankita.s.shetty65 at gmail.com>
Date:   Fri Nov 20 10:15:35 2020 +0100

    x509_vfy.c: Remove superfluous assignment to 'ret' in check_chain()
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/13458)

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

Summary of changes:
 crypto/x509/x509_vfy.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 1ee688f3b8..d73e078cfe 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -484,11 +484,9 @@ static int check_chain(X509_STORE_CTX *ctx)
             CHECK_CB((ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0
                          && ret != 1 && ret != 0,
                      ctx, x, i, X509_V_ERR_INVALID_CA);
-            ret = 1;
             break;
         case 0:
-            CHECK_CB(ret != 0,  ctx, x, i, X509_V_ERR_INVALID_NON_CA);
-            ret = 1;
+            CHECK_CB(ret != 0, ctx, x, i, X509_V_ERR_INVALID_NON_CA);
             break;
         default:
             /* X509_V_FLAG_X509_STRICT is implicit for intermediate CAs */
@@ -496,7 +494,6 @@ static int check_chain(X509_STORE_CTX *ctx)
                      || ((i + 1 < num
                           || ctx->param->flags & X509_V_FLAG_X509_STRICT)
                          && ret != 1), ctx, x, i, X509_V_ERR_INVALID_CA);
-            ret = 1;
             break;
         }
         if (num > 1) {