typo in s_client

[openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index db0ab1a6e93c6789bb9c7dfa53c9e9c1cfd93eca..3bb261010f9a6f10d0401603211ab74ac89be474 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -73,7 +73,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
-#include <openssl/ssl.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
@@ -215,7 +214,8 @@ int MAIN(int argc, char **argv)
        int need_rand = 0;
        int checkend=0,checkoffset=0;
        unsigned long nmflag = 0, certflag = 0;
-       unsigned char *checkhost = NULL, *checkemail = NULL;
+       char *checkhost = NULL;
+       char *checkemail = NULL;
        char *checkip = NULL;
 #ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
@@ -225,8 +225,6 @@ int MAIN(int argc, char **argv)
 
        apps_startup();
 
-       X509V3_EXT_add_rfc6962();
-
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
@@ -477,12 +475,12 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-checkhost") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       checkhost=(unsigned char *)*(++argv);
+                       checkhost=*(++argv);
                        }
                else if (strcmp(*argv,"-checkemail") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       checkemail=(unsigned char *)*(++argv);
+                       checkemail=*(++argv);
                        }
                else if (strcmp(*argv,"-checkip") == 0)
                        {
@@ -1158,7 +1156,6 @@ end:
        sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
        sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
        if (passin) OPENSSL_free(passin);
-       X509V3_EXT_cleanup();
        apps_shutdown();
        OPENSSL_EXIT(ret);
        }