From 8173960305acbb7a1ad325a0878d96576aca64b1 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sat, 10 Dec 2011 00:42:48 +0000
Subject: [PATCH] remove old -attime code, new version includes all old
 functionality

---
 CHANGES       |  4 ++--
 apps/verify.c | 32 ++++----------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/CHANGES b/CHANGES
index b98e702dd1..971501f6d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -129,8 +129,8 @@
      keep original code iff non-FIPS operations are allowed.
      [Steve Henson]
 
-  *) Add -attime option to openssl verify.
-     [Peter Eckersley <pde@eff.org> and Ben Laurie]
+  *) Add -attime option to openssl utilities.
+     [Peter Eckersley <pde@eff.org>, Ben Laurie and Steve Henson]
 
   *) Redirect DSA and DH operations to FIPS module in FIPS mode.
      [Steve Henson]
diff --git a/apps/verify.c b/apps/verify.c
index 1888ce7ef9..b9749dcd36 100644
--- 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,23 +222,10 @@ 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 */
-		}
-
-	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++)
-			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) {
@@ -275,7 +254,7 @@ end:
 
 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 +280,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);
 
-- 
2.25.1