X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ssl%2Fssltest.c;h=4e4ce7d096ad94ac1200fa05d133821356249e4a;hb=23f80f46a43badabadb3f14487b8cd9af3336ef2;hp=caf5876e5a2f3f1c58d92e21898e45af888459f5;hpb=46b3bd54544caf828dcbcac093b5341c10802459;p=openssl.git

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index caf5876e5a..4e4ce7d096 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -85,6 +85,11 @@
 #  define TEST_CLIENT_CERT "../apps/client.pem"
 #endif
 
+/* There is really no standard for this, so let's assign some tentative
+   numbers.  In any case, these numbers are only for this test */
+#define COMP_RLE	1
+#define COMP_ZLIB	2
+
 static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #ifndef NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength);
@@ -148,6 +153,8 @@ static void sv_usage(void)
 	fprintf(stderr," -bio_pair     - Use BIO pairs\n");
 	fprintf(stderr," -f            - Test even cases that can't work\n");
 	fprintf(stderr," -time         - measure processor time used by client and server\n");
+	fprintf(stderr," -zlib         - use zlib compression\n");
+	fprintf(stderr," -time         - use rle compression\n");
 	}
 
 static void print_details(SSL *c_ssl, const char *prefix)
@@ -220,6 +227,7 @@ int main(int argc, char *argv[])
 	int no_dhe = 0;
 	int print_time = 0;
 	clock_t s_time = 0, c_time = 0;
+	int comp = 0;
 
 	verbose = 0;
 	debug = 0;
@@ -333,6 +341,14 @@ int main(int argc, char *argv[])
 			{
 			print_time = 1;
 			}
+		else if	(strcmp(*argv,"-zlib") == 0)
+			{
+			comp = COMP_ZLIB;
+			}
+		else if	(strcmp(*argv,"-rle") == 0)
+			{
+			comp = COMP_RLE;
+			}
 		else
 			{
 			fprintf(stderr,"unknown option %s\n",*argv);
@@ -374,6 +390,23 @@ bad:
 	SSL_library_init();
 	SSL_load_error_strings();
 
+	if (comp == COMP_ZLIB)
+		{
+		COMP_METHOD *cm = COMP_zlib();
+		if (cm->type != NID_undef)
+			SSL_COMP_add_compression_method(COMP_ZLIB, cm);
+		else
+			fprintf(stderr, "Warning: zlib compression not supported\n");
+		}
+	if (comp == COMP_RLE)
+		{
+		COMP_METHOD *cm = COMP_rle();
+		if (cm->type != NID_undef)
+			SSL_COMP_add_compression_method(COMP_RLE, cm);
+		else
+			fprintf(stderr, "Warning: rle compression not supported\n");
+		}
+
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
 	if (ssl2)
 		meth=SSLv2_method();
@@ -1193,7 +1226,7 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
 	ret=0;
 err:
 	/* We have to set the BIO's to NULL otherwise they will be
-	 * Free()ed twice.  Once when th s_ssl is SSL_free()ed and
+	 * OPENSSL_free()ed twice.  Once when th s_ssl is SSL_free()ed and
 	 * again when c_ssl is SSL_free()ed.
 	 * This is a hack required because s_ssl and c_ssl are sharing the same
 	 * BIO structure and SSL_set_bio() and SSL_free() automatically
@@ -1278,7 +1311,7 @@ static void free_tmp_rsa(void)
  *    $ openssl dhparam -C -noout -dsaparam 1024
  * (The third function has been renamed to avoid name conflicts.)
  */
-DH *get_dh512()
+static DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
 		0xCB,0xC8,0xE1,0x86,0xD0,0x1F,0x94,0x17,0xA6,0x99,0xF0,0xC6,
@@ -1301,7 +1334,7 @@ DH *get_dh512()
 	return(dh);
 	}
 
-DH *get_dh1024()
+static DH *get_dh1024()
 	{
 	static unsigned char dh1024_p[]={
 		0xF8,0x81,0x89,0x7D,0x14,0x24,0xC5,0xD1,0xE6,0xF7,0xBF,0x3A,
@@ -1329,7 +1362,7 @@ DH *get_dh1024()
 	return(dh);
 	}
 
-DH *get_dh1024dsa()
+static DH *get_dh1024dsa()
 	{
 	static unsigned char dh1024_p[]={
 		0xC8,0x00,0xF7,0x08,0x07,0x89,0x4D,0x90,0x53,0xF3,0xD5,0x00,