[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  09235289c377ff998964bb6b074bb2a3ad768fd2 (commit)
      from  ff3e4508bde0d7f7ab211ca9f027bef820ba1d70 (commit)


- Log -----------------------------------------------------------------
commit 09235289c377ff998964bb6b074bb2a3ad768fd2
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Nov 5 17:16:03 2021 +0800

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

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

Summary of changes:
 crypto/x509/x_name.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index d5ef8e3408..bed2d049b4 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -219,8 +219,8 @@ static int x509_name_ex_i2d(const 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) {