Align CRL and CSR version printing with certs

Only print specified 0-based versions and print them with the 1-based
human interpretation. Use a colon and error check the BIO_printf()
calls. (There's a lot more to clean up in here, but that's for another
day).

Notably, X509_CRL_print_ex() is missing... I guess that's better than
having one with signature and semantics differing from X509_print_ex()
und X509_REQ_print_ex().

ok beck

1 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c
index 39e04507ed..6449e7f199 100644
--- a/src/lib/libcrypto/asn1/t_crl.c
+++ b/src/lib/libcrypto/asn1/t_crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_crl.c,v 1.25 2024/05/02 15:33:59 tb Exp $ */
+/* $OpenBSD: t_crl.c,v 1.26 2024/05/03 02:52:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -96,9 +96,15 @@ X509_CRL_print(BIO *out, X509_CRL *x)
 
         BIO_printf(out, "Certificate Revocation List (CRL):\n");
         l = X509_CRL_get_version(x);
-        if (l < 0 || l == LONG_MAX)
-                goto err;
-        BIO_printf(out, "%8sVersion %lu (0x%lx)\n", "", l + 1, l);
+        if (l >= 0 && l <= 1) {
+                if (BIO_printf(out, "%8sVersion: %lu (0x%lx)\n",
+                    "", l + 1, l) <= 0)
+                        goto err;
+        } else {
+                if (BIO_printf(out, "%8sVersion: unknown (%ld)\n",
+                    "", l) <= 0)
+                        goto err;
+        }
         if (X509_signature_print(out, x->sig_alg, NULL) == 0)
                 goto err;
         p = X509_NAME_oneline(X509_CRL_get_issuer(x), NULL, 0);