Rename "openssl x509" option "-config" to "-extfile", because it

doesn't have a default value like the "-config" options of other
openssl subprograms.

diff --git a/apps/openssl.cnf b/apps/openssl.cnf
index 5ecc21571ac3df884430b36c9848f7c16b956e6d..8ec117ddd23c788da3b689d3b9b913651a291eaf 100644 (file)
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -7,7 +7,7 @@ RANDFILE                = $ENV::HOME/.rnd
 oid_file               = $ENV::HOME/.oid
 oid_section            = new_oids
 
 oid_file               = $ENV::HOME/.oid
 oid_section            = new_oids
 

-# To use this configuration file with the "-config" option of the
+# To use this configuration file with the "-extfile" option of the

 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
 # extensions           = 
 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
 # extensions           = 

diff --git a/apps/x509.c b/apps/x509.c
index 5434b53365ea391d6dac173cde607bc1ef69757a..cc4824786259a559cc57c4f257481cf2086f2e42 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -114,7 +114,7 @@ static char *x509_usage[]={
 " -text           - print the certificate in text form\n",
 " -C              - print out C code forms\n",
 " -md2/-md5/-sha1/-mdc2 - digest to do an RSA sign with\n",
 " -text           - print the certificate in text form\n",
 " -C              - print out C code forms\n",
 " -md2/-md5/-sha1/-mdc2 - digest to do an RSA sign with\n",

-" -config         - configuration file with X509V3 extensions to add\n",
+" -extfile        - configuration file with X509V3 extensions to add\n",

 NULL
 };
 
 NULL
 };
 


@@ -213,7 +213,7 @@ int MAIN(int argc, char **argv)
                                goto bad;
                                }
                        }
                                goto bad;
                                }
                        }

-               else if (strcmp(*argv,"-config") == 0)
+               else if (strcmp(*argv,"-extfile") == 0)

                        {
                        if (--argc < 1) goto bad;
                        extfile= *(++argv);
                        {
                        if (--argc < 1) goto bad;
                        extfile= *(++argv);

diff --git a/doc/openssl.txt b/doc/openssl.txt
index 64ae41ff67e7dc52d5ecb919b196d4d37ae095ff..527bd9722de36c9de87aae23948d5c491363e386 100644 (file)
--- a/doc/openssl.txt
+++ b/doc/openssl.txt
@@ -99,7 +99,7 @@ extension section is used when the -x509 option is present to create a
 self signed root certificate.
 
 The 'x509' utility also supports extensions when it signs a certificate.
 self signed root certificate.
 
 The 'x509' utility also supports extensions when it signs a certificate.

-The -config option is used to set the configuration file containing the
+The -extfile option is used to set the configuration file containing the

 extensions. In this case a line with:
 
 extensions = extension_section
 extensions. In this case a line with:
 
 extensions = extension_section