Back out redundant verification time change.

diff --git a/CHANGES b/CHANGES
index d6ad39f95ee1a8a3ee08a705c9600582b1b0c8b7..96b95565a62ca2ce04ca5655857f5ab6423d19d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -472,9 +472,6 @@
   *) Add SRP support.
      [Tom Wu <tjw@cs.stanford.edu> and Ben Laurie]
 
   *) Add SRP support.
      [Tom Wu <tjw@cs.stanford.edu> and Ben Laurie]
 

-  *) Add -attime option to openssl verify.
-     [Peter Eckersley <pde@eff.org> and Ben Laurie]
-

   *) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
      [Steve Henson]
 
   *) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
      [Steve Henson]
 

diff --git a/apps/verify.c b/apps/verify.c
index abb6ab30b0aeb11604618dcbb956e7a807032527..4fd6b192e34d6c1a983c0d38d415452e8aa93459 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,
 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 **);
 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;
        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;
        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);
                                }
                                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)
                                {
 #ifndef OPENSSL_NO_ENGINE
                        else if (strcmp(*argv,"-engine") == 0)
                                {


@@ -230,28 +222,14 @@ int MAIN(int argc, char **argv)
                        goto end;
                }
 
                        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 */
-               }
-
-       if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e, t);
+       if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e);

        else
                for (i=0; i<argc; i++)
        else
                for (i=0; i<argc; i++)

-                       check(cert_ctx,argv[i], untrusted, trusted, crls, e, t);
+                       check(cert_ctx,argv[i], untrusted, trusted, crls, e);

        ret=0;
 end:
        if (ret == 1) {
                BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
        ret=0;
 end:
        if (ret == 1) {
                BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");

-               BIO_printf(bio_err," [-attime timestamp]");

 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," [-engine e]");
 #endif
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," [-engine e]");
 #endif


@@ -288,7 +266,7 @@ end:
 
 static int check(X509_STORE *ctx, char *file,
                STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
 
 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;
        {
        X509 *x=NULL;
        int i=0,ret=0;


@@ -314,9 +292,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(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);
 
        i=X509_verify_cert(csc);
        X509_STORE_CTX_free(csc);