[openssl] OpenSSL_1_1_1-stable update

[Dr. Paul Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  92cef3f186c20e702b7751c5ef959b4fe816a189 (commit)
      from  ac4f465406ced9601cb8c9cb800ad9a37e61b6da (commit)


- Log -----------------------------------------------------------------
commit 92cef3f186c20e702b7751c5ef959b4fe816a189
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)
    
    (cherry picked from commit 0800288e6e1d9f44d471043a970ba57743ca8f4c)

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

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 9307ff0464..b178be067a 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--;
     }