Fix openssl passwd -1

[oweals/openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index 3bef1fc590a62342c72314ff65e824eb47e4b0c5..76dd66db86250b039e8af0a51b1a286e86d0c5ca 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -129,7 +129,6 @@ static char *x509_usage[]={
 " -extensions     - section from config file with X509V3 extensions to add\n",
 " -clrext         - delete extensions before signing and input certificate\n",
 " -nameopt arg    - various certificate name options\n",
-" -certopt arg    - various certificate text options\n",
 NULL
 };
 
@@ -175,7 +174,7 @@ int MAIN(int argc, char **argv)
        char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL;
        int need_rand = 0;
        int checkend=0,checkoffset=0;
-       unsigned long nmflag = 0, certflag = 0;
+       unsigned long nmflag = 0;
 
        reqfile=0;
 
@@ -327,11 +326,6 @@ int MAIN(int argc, char **argv)
                        alias= *(++argv);
                        trustout = 1;
                        }
-               else if (strcmp(*argv,"-certopt") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                       if (!set_cert_ex(&certflag, *(++argv))) goto bad;
-                       }
                else if (strcmp(*argv,"-nameopt") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -780,7 +774,7 @@ bad:
                                }
                        else if (text == i)
                                {
-                               X509_print_ex(out,x,nmflag, certflag);
+                               X509_print(out,x);
                                }
                        else if (startdate == i)
                                {