apps/ocsp.c

[openssl.git] / apps / verify.c

diff --git a/apps/verify.c b/apps/verify.c
index 1888ce7ef9aadc16cb32035628af187e15a11d10..893670ff41321317e7a057e0a8c3fd64cb7d048a 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -72,7 +72,7 @@
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
 static int check(X509_STORE *ctx, char *file,
                STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-               STACK_OF(X509_CRL) *crls, ENGINE *e, time_t at_time);
+               STACK_OF(X509_CRL) *crls, ENGINE *e);
 static int v_verbose=0, vflags = 0;
 
 int MAIN(int, char **);
@@ -83,9 +83,6 @@ int MAIN(int argc, char **argv)
        int i,ret=1, badarg = 0;
        char *CApath=NULL,*CAfile=NULL;
        char *untfile = NULL, *trustfile = NULL, *crlfile = NULL;
-       char *checktime_string = NULL;
-       long int timestamp;
-       time_t t = 0;
        STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
        STACK_OF(X509_CRL) *crls = NULL;
        X509_STORE *cert_ctx=NULL;
@@ -148,11 +145,6 @@ int MAIN(int argc, char **argv)
                                if (argc-- < 1) goto end;
                                crlfile= *(++argv);
                                }
-                       else if (strcmp(*argv,"-attime") == 0)
-                               {
-                               if (argc-- < 1) goto end;
-                               checktime_string= *(++argv);
-                               }
 #ifndef OPENSSL_NO_ENGINE
                        else if (strcmp(*argv,"-engine") == 0)
                                {
@@ -230,24 +222,19 @@ int MAIN(int argc, char **argv)
                        goto end;
                }
 
-       if(checktime_string)
-               {
-               /* interpret the -attime argument as seconds since Epoch */
-               if (sscanf(checktime_string, "%li", &timestamp) != 1)
-                       {
-                       BIO_printf(bio_err, "Error parsing timestamp %s\n",
-                                          checktime_string);
-                       ERR_print_errors(bio_err);
-                       goto end;
-                       }
-               t = (time_t) timestamp;  /* on some platforms time_t may be a float */
+       ret = 0;
+       if (argc < 1)
+               { 
+               if (1 != check(cert_ctx, NULL, untrusted, trusted, crls, e))
+                       ret = -1;
                }
-
-       if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e, t);
        else
+               {
                for (i=0; i<argc; i++)
-                       check(cert_ctx,argv[i], untrusted, trusted, crls, e, t);
-       ret=0;
+                       if (1 != check(cert_ctx,argv[i], untrusted, trusted, crls, e))
+                               ret = -1;
+               }
+
 end:
        if (ret == 1) {
                BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
@@ -256,13 +243,16 @@ end:
                BIO_printf(bio_err," [-engine e]");
 #endif
                BIO_printf(bio_err," cert1 cert2 ...\n");
+
                BIO_printf(bio_err,"recognized usages:\n");
-               for(i = 0; i < X509_PURPOSE_get_count(); i++) {
+               for(i = 0; i < X509_PURPOSE_get_count(); i++)
+                       {
                        X509_PURPOSE *ptmp;
                        ptmp = X509_PURPOSE_get0(i);
-                       BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
-                                                               X509_PURPOSE_get0_name(ptmp));
-               }
+                       BIO_printf(bio_err, "\t%-10s\t%s\n",
+                                  X509_PURPOSE_get0_sname(ptmp),
+                                  X509_PURPOSE_get0_name(ptmp));
+                       }
        }
        if (vpm) X509_VERIFY_PARAM_free(vpm);
        if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
@@ -270,12 +260,12 @@ end:
        sk_X509_pop_free(trusted, X509_free);
        sk_X509_CRL_pop_free(crls, X509_CRL_free);
        apps_shutdown();
-       OPENSSL_EXIT(ret);
+       OPENSSL_EXIT(ret < 0 ? 2 : ret);
        }
 
 static int check(X509_STORE *ctx, char *file,
                STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-               STACK_OF(X509_CRL) *crls, ENGINE *e, time_t at_time)
+               STACK_OF(X509_CRL) *crls, ENGINE *e)
        {
        X509 *x=NULL;
        int i=0,ret=0;
@@ -301,9 +291,6 @@ static int check(X509_STORE *ctx, char *file,
        if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
        if (crls)
                X509_STORE_CTX_set0_crls(csc, crls);
-       if (at_time) 
-               X509_STORE_CTX_set_time(csc, 0, at_time);
-
        i=X509_verify_cert(csc);
        X509_STORE_CTX_free(csc);