[openssl/openssl] af3140: x509_print_ex:Use correct constant for nmflag comp...

[Damian Hobson-Garcia]

  Branch: refs/heads/openssl-3.0
  Home:   https://github.com/openssl/openssl
  Commit: af3140e79167365852d8f4aa2c31dc19a8c97c66
      https://github.com/openssl/openssl/commit/af3140e79167365852d8f4aa2c31dc19a8c97c66
  Author: Damian Hobson-Garcia <dhobsong at igel.co.jp>
  Date:   2023-10-26 (Thu, 26 Oct 2023)

  Changed paths:
    M crypto/x509/t_req.c
    M crypto/x509/t_x509.c

  Log Message:
  -----------
  x509_print_ex:Use correct constant for nmflag comparison

The X509_FLAG_COMPAT constant is defined as a value of the
X509_print_ex() cflags argument, and so it should not be used
to compare against values for use with X509_NAME_print flags.
Use XN_FLAG_COMPAT, which has the same value, instead.

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

(cherry picked from commit da2dd3b51ddd69aae0fd840c0d23afa954c24ded)


  Commit: aa1a5ea8451a348e2a3c76702afe8836546c3c60
      https://github.com/openssl/openssl/commit/aa1a5ea8451a348e2a3c76702afe8836546c3c60
  Author: Damian Hobson-Garcia <dhobsong at igel.co.jp>
  Date:   2023-10-26 (Thu, 26 Oct 2023)

  Changed paths:
    M crypto/x509/t_req.c

  Log Message:
  -----------
  Fix X509_REQ_print_ex bug

Similar to the bug fixed in 02db7354fe7 (Fix bug in X509_print_ex).
The error return value from X509_NAME_print_ex() is different
depending on whether the flags are XN_FLAG_COMPAT or not.
Apply a similar fix to what was done for X509_print_ex here as well.

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

(cherry picked from commit 2b5e028a2f70de216458a5140bcf4ec3d9236eeb)


  Commit: 69bf1aa91e85ccdc8a6b4dc19d95d4801975192e
      https://github.com/openssl/openssl/commit/69bf1aa91e85ccdc8a6b4dc19d95d4801975192e
  Author: Damian Hobson-Garcia <dhobsong at igel.co.jp>
  Date:   2023-10-26 (Thu, 26 Oct 2023)

  Changed paths:
    M crypto/x509/t_req.c
    M crypto/x509/t_x509.c

  Log Message:
  -----------
  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 at openssl.org>
Reviewed-by: Todd Short <todd.short at me.com>
(Merged from https://github.com/openssl/openssl/pull/19963)

(cherry picked from commit 2126ca3dba3907f49b232442c06db1cae8bee0c3)


Compare: https://github.com/openssl/openssl/compare/6f4da1705675...69bf1aa91e85