Use prototypes.

[openssl.git] / ssl / ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index bebe7261921ea9adfa3451d684031ea33862a5a9..2e373a8f379c40336139e1884736299f7b088456 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -97,8 +97,8 @@ static BIO *bio_err=NULL;
 static BIO *bio_stdout=NULL;
 
 static char *cipher=NULL;
-int verbose=0;
-int debug=0;
+static int verbose=0;
+static int debug=0;
 #if 0
 /* Not used yet. */
 #ifdef FIONBIO
@@ -167,12 +167,15 @@ int main(int argc, char *argv[])
 #ifndef NO_DH
        DH *dh;
 #endif
+       verbose = 0;
+       debug = 0;
+       cipher = 0;
+       
+       CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
        bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
        bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE);
 
-       CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
        argc--;
        argv++;
 
@@ -395,6 +398,11 @@ bad:
                SSL_CTX_set_verify(c_ctx,SSL_VERIFY_PEER,
                        verify_callback);
                }
+       
+       {
+               int session_id_context = 0;
+               SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context, sizeof session_id_context);
+       }
 
        c_ssl=SSL_new(c_ctx);
        s_ssl=SSL_new(s_ctx);
@@ -432,6 +440,7 @@ end:
        ERR_remove_state(0);
        EVP_cleanup();
        CRYPTO_mem_leaks(bio_err);
+       if (bio_err != NULL) BIO_free(bio_err);
        EXIT(ret);
        }
 
@@ -727,7 +736,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count)
                                                num = INT_MAX;
 
                                        if (num > 1)
-                                               --num; /* for testing restartability even more thoroughly */
+                                               --num; /* test restartability even more thoroughly */
                                        
                                        r = BIO_nwrite(io1, &dataptr, (int)num);
                                        assert(r > 0);