Live code cleanup; #if 1 removal

[openssl.git] / ssl / ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index b90f6fb28040ed47802124882e4a6d9eda214ec1..3eb13e26dd4b2ee0b5b00515ff061d16360aabb0 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -188,6 +188,8 @@
 #endif
 #include <openssl/bn.h>
 
+#include "../ssl/ssl_locl.h"
+
 /*
  * Or gethostname won't be declared properly
  * on Compaq platforms (at least with DEC C).
@@ -738,13 +740,6 @@ static int custom_ext_3_srv_add_cb(SSL *s, unsigned int ext_type,
 static char *cipher = NULL;
 static int verbose = 0;
 static int debug = 0;
-#if 0
-/* Not used yet. */
-# ifdef FIONBIO
-static int s_nbio = 0;
-# endif
-#endif
-
 static const char rnd_seed[] =
     "string to make the random number generator think it has entropy";
 
@@ -752,6 +747,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long bytes, clock_t *s_time,
                  clock_t *c_time);
 int doit(SSL *s_ssl, SSL *c_ssl, long bytes);
 static int do_test_cipherlist(void);
+
 static void sv_usage(void)
 {
     fprintf(stderr, "usage: ssltest [args ...]\n");
@@ -1771,7 +1767,6 @@ int main(int argc, char *argv[])
     if (bio_err != NULL)
         BIO_free(bio_err);
     EXIT(ret);
-    return ret;
 }
 
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
@@ -2486,10 +2481,6 @@ static int verify_callback(int ok, X509_STORE_CTX *ctx)
 
     if (ok == 1) {
         X509 *xs = ctx->current_cert;
-#if 0
-        X509 *xi = ctx->current_issuer;
-#endif
-
         if (xs->ex_flags & EXFLAG_PROXY) {
             unsigned int *letters = X509_STORE_CTX_get_ex_data(ctx,
                                                                get_proxy_auth_ex_data_idx