fix memory leak

[openssl.git] / apps / s_time.c

diff --git a/apps/s_time.c b/apps/s_time.c
index a08a14d83ad367a843c09c002379efb8d3d91f3d..263502c753ea16d272ada6c453eac7ae024b8764 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -38,9 +38,6 @@
  * #define TEST_CERT "client.pem"
  */
 
-#undef BUFSIZZ
-#define BUFSIZZ 1024*10
-
 #undef min
 #undef max
 #define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -50,9 +47,6 @@
 #define SECONDS 30
 #define SECONDSSTR "30"
 
-extern int verify_depth;
-extern int verify_error;
-
 static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx);
 
 static const char fmt_http_get_cmd[] = "GET %s HTTP/1.0\r\n\r\n";
@@ -116,8 +110,6 @@ int s_time_main(int argc, char **argv)
     size_t buf_size;
 
     meth = TLS_client_method();
-    verify_depth = 0;
-    verify_error = X509_V_OK;
 
     prog = opt_init(argc, argv, s_time_options);
     while ((o = opt_next()) != OPT_EOF) {
@@ -141,10 +133,10 @@ int s_time_main(int argc, char **argv)
             perform = 1;
             break;
         case OPT_VERIFY:
-            if (!opt_int(opt_arg(), &verify_depth))
+            if (!opt_int(opt_arg(), &verify_args.depth))
                 goto opthelp;
             BIO_printf(bio_err, "%s: verify depth is %d\n",
-                       prog, verify_depth);
+                       prog, verify_args.depth);
             break;
         case OPT_CERT:
             certfile = opt_arg();
@@ -415,9 +407,9 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
     }
     if (i <= 0) {
         BIO_printf(bio_err, "ERROR\n");
-        if (verify_error != X509_V_OK)
+        if (verify_args.error != X509_V_OK)
             BIO_printf(bio_err, "verify error:%s\n",
-                       X509_verify_cert_error_string(verify_error));
+                       X509_verify_cert_error_string(verify_args.error));
         else
             ERR_print_errors(bio_err);
         if (scon == NULL)