From: PW Hu <jlu.hpw@foxmail.com>
Date: Fri, 5 Nov 2021 09:16:03 +0000 (+0800)
Subject: Fix: invoking x509_name_cannon improperly
X-Git-Tag: OpenSSL_1_1_1m~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45838e536c08c74e68536501d6dc2ef9f4d499da;p=thirdparty%2Fopenssl.git

Fix: invoking x509_name_cannon improperly

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16974)

(cherry picked from commit 09235289c377ff998964bb6b074bb2a3ad768fd2)
---

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index aa7f4722b6b..2214e580c87 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -217,8 +217,8 @@ static int x509_name_ex_i2d(ASN1_VALUE **val, unsigned char **out,
         if (ret < 0)
             return ret;
         ret = x509_name_canon(a);
-        if (ret < 0)
-            return ret;
+        if (!ret)
+            return -1;
     }
     ret = a->bytes->length;
     if (out != NULL) {