diff options
author | Damian Hobson-Garcia <dhobsong@igel.co.jp> | 2022-12-22 17:15:55 -0500 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2023-10-26 15:50:13 +0100 |
commit | 69bf1aa91e85ccdc8a6b4dc19d95d4801975192e (patch) | |
tree | 3ce052ff69dae9abdc69f9c0f00ca9877ba76bed /crypto | |
parent | aa1a5ea8451a348e2a3c76702afe8836546c3c60 (diff) |
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 <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/19963)
(cherry picked from commit 2126ca3dba3907f49b232442c06db1cae8bee0c3)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/x509/t_req.c | 4 | ||||
-rw-r--r-- | 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 8f7ea53b3e..5b0282bc13 100644 --- a/crypto/x509/t_x509.c +++ b/crypto/x509/t_x509.c @@ -60,10 +60,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) |