Fix typo in -clrext option, but add a compatibility hack because

0.9.5a should not break anything that works in 0.9.5.

diff --git a/CHANGES b/CHANGES
index b98ea514a0166964b0be2f2d9e19031940c1f753..90383f7e4f42d9e28b618e9fefd2ce8603d41d4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.5 and 0.9.5a  [XX XXX 2000]
 
+  *) Rename openssl x509 option '-crlext', which was added in 0.9.5,
+     to '-clrext' (= clear extensions), as intended and documented.
+     [Bodo Moeller; inconsistency pointed out by Michael Attili
+     <attili@amaxo.com>]
+
   *) Fix for HMAC. It wasn't zeroing the rest of the block if the key length
      was larger than the MD block size.      
      [Steve Henson, pointed out by Yost William <YostW@tce.com>]

diff --git a/apps/x509.c b/apps/x509.c
index d5c0d0404e535c41e4c4b6696b508648d5b86c70..2d6384184c9e08d2f3d82145a787718cab038ab1 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -126,7 +126,7 @@ static char *x509_usage[]={
 " -md2/-md5/-sha1/-mdc2 - digest to use\n",
 " -extfile        - configuration file with X509V3 extensions to add\n",
 " -extensions     - section from config file with X509V3 extensions to add\n",
-" -crlext         - delete extensions before signing and input certificate\n",
+" -clrext         - delete extensions before signing and input certificate\n",
 NULL
 };
 
@@ -365,8 +365,15 @@ int MAIN(int argc, char **argv)
                        aliasout= ++num;
                else if (strcmp(*argv,"-CAcreateserial") == 0)
                        CA_createserial= ++num;
+               else if (strcmp(*argv,"-clrext") == 0)
+                       clrext = 1;
+#if 1 /* stay backwards-compatible with 0.9.5; this should go away soon */
                else if (strcmp(*argv,"-crlext") == 0)
+                       {
+                       BIO_printf(bio_err,"use -clrext instead of -crlext\n");
                        clrext = 1;
+                       }
+#endif
                else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
                        {
                        /* ok */