x509_print_ex: Remove unused setting when XN_FLAG_COMPAT is set
authorDamian Hobson-Garcia <dhobsong@igel.co.jp>
Thu, 22 Dec 2022 22:15:55 +0000 (17:15 -0500)
committerMatt Caswell <matt@openssl.org>
Thu, 26 Oct 2023 14:48:00 +0000 (15:48 +0100)
Calling X509_NAME_print_ex with XN_FLAG_COMPAT falls back to calling
X509_NAME_print().  The obase parameter to X509_NAME_print() is not
used, so setting it to a different value has no effect.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/19963)

crypto/x509/t_req.c
crypto/x509/t_x509.c

index 22f824ee48c29ce65abd8b2bf23e6e830d7e5f0f..63626c0d981096d51bac710a4eb5354f267c5861 100644 (file)
@@ -49,10 +49,8 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
         nmindent = 12;
     }
 
-    if (nmflags == XN_FLAG_COMPAT) {
-        nmindent = 16;
+    if (nmflags == XN_FLAG_COMPAT)
         printok = 1;
-    }
 
     if (!(cflag & X509_FLAG_NO_HEADER)) {
         if (BIO_write(bp, "Certificate Request:\n", 21) <= 0)
index 3e404b9adcc8d41a824fc6369b5c925586fed985..192998d45332c961effbefa2193af80336b1784a 100644 (file)
@@ -65,10 +65,8 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
         nmindent = 12;
     }
 
-    if (nmflags == XN_FLAG_COMPAT) {
-        nmindent = 16;
+    if (nmflags == XN_FLAG_COMPAT)
         printok = 1;
-    }
 
     if (!(cflag & X509_FLAG_NO_HEADER)) {
         if (BIO_write(bp, "Certificate:\n", 13) <= 0)