Fix `openssl crl -noout -text' combination where `-noout' killed the `-text'

option at all and this way the `-noout -text' combination was inconsistent in
`openssl crl' with the friends in `openssl x509|rsa|dsa'.

diff --git a/CHANGES b/CHANGES
index 2e420fa21dfd6bbaa55d634817ca182e5b32ecda..cac99a373487467ab050f3be2c42e8ef2c8dfdd4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 
  Changes between 0.9.2b and 0.9.3
 
+  *) Fix `openssl crl -noout -text' combination where `-noout' killed the
+     `-text' option at all and this way the `-noout -text' combination was
+     inconsistent in `openssl crl' with the friends in `openssl x509|rsa|dsa'.
+     [Ralf S. Engelschall]
+
   *) Make sure a corresponding plain text error message exists for the
      X509_V_ERR_CERT_REVOKED/23 error number which can occur when a
      verify callback function determined that a certificate was revoked.

diff --git a/apps/crl.c b/apps/crl.c
index a35e85733b887d2a281c24ee9f03c47d43b656ff..3bb7aae11eca25e1cebd91141f2fdbd966db9981 100644 (file)
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -221,8 +221,6 @@ bad:
                        }
                }
 
-       if (noout) goto end;
-
        out=BIO_new(BIO_s_file());
        if (out == NULL)
                {
@@ -242,6 +240,9 @@ bad:
                }
 
        if (text) X509_CRL_print(out, x);
+
+       if (noout) goto end;
+
        if      (outformat == FORMAT_ASN1)
                i=(int)i2d_X509_CRL_bio(out,x);
        else if (outformat == FORMAT_PEM)