[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  0800288e6e1d9f44d471043a970ba57743ca8f4c (commit)
      from  670ff08e77c5b331443a3ed6d41564d863a47f06 (commit)


- Log -----------------------------------------------------------------
commit 0800288e6e1d9f44d471043a970ba57743ca8f4c
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jun 13 22:16:14 2020 +0200

    EVP: allow empty strings to EVP_Decode* functions
    
    This is a simple check order correction.
    
    Fixes #12143
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12144)

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

Summary of changes:
 crypto/evp/encode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index fb657d1499..01552ac098 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -423,7 +423,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
         table = data_ascii2bin;
 
     /* trim white space from the start of the line. */
-    while ((conv_ascii2bin(*f, table) == B64_WS) && (n > 0)) {
+    while ((n > 0) && (conv_ascii2bin(*f, table) == B64_WS)) {
         f++;
         n--;
     }