From: Richard Levitte <levitte@openssl.org>
Date: Sat, 13 Jun 2020 20:16:14 +0000 (+0200)
Subject: EVP: allow empty strings to EVP_Decode* functions
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92cef3f186c20e702b7751c5ef959b4fe816a189;p=oweals%2Fopenssl.git

EVP: allow empty strings to EVP_Decode* functions

This is a simple check order correction.

Fixes #12143

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12144)

(cherry picked from commit 0800288e6e1d9f44d471043a970ba57743ca8f4c)
---

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--;
     }