From 2126ca3dba3907f49b232442c06db1cae8bee0c3 Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia Date: Thu, 22 Dec 2022 17:15:55 -0500 Subject: [PATCH] x509_print_ex: Remove unused setting when XN_FLAG_COMPAT is set 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 Reviewed-by: Todd Short (Merged from https://github.com/openssl/openssl/pull/19963) --- crypto/x509/t_req.c | 4 +--- crypto/x509/t_x509.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c index 22f824ee48..63626c0d98 100644 --- a/crypto/x509/t_req.c +++ b/crypto/x509/t_req.c @@ -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) diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c index 3e404b9adc..192998d453 100644 --- a/crypto/x509/t_x509.c +++ b/crypto/x509/t_x509.c @@ -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)