Commit 566dda07 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

New option SSL_OP_NO_COMP to disable compression. New ctrls to set 

maximum send fragment size. Allocate I/O buffers accordingly.
parent 7a2f4cbf

CHANGES

+6 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,12 @@ 




 Changes between 0.9.8a and 0.9.9  [xx XXX xxxx]

 Changes between 0.9.8a and 0.9.9  [xx XXX xxxx]





  *) New option SSL_OP_NO_COMP to disable use of compression selectively

     in SSL structures. New SSL ctrl to set maximum send fragment size. 

     Save memory by seeting the I/O buffer sizes dynamically instead of

     using the maximum available value.

     [Steve Henson]



  *) New option -V for 'openssl ciphers'. This prints the ciphersuite code

  *) New option -V for 'openssl ciphers'. This prints the ciphersuite code

     in addition to the text details.

     in addition to the text details.

     [Bodo Moeller]

     [Bodo Moeller]

apps/s_client.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -450,6 +450,8 @@ int MAIN(int argc, char **argv) 
			off|=SSL_OP_NO_SSLv3;

			off|=SSL_OP_NO_SSLv3;

		else if (strcmp(*argv,"-no_ssl2") == 0)

		else if (strcmp(*argv,"-no_ssl2") == 0)

			off|=SSL_OP_NO_SSLv2;

			off|=SSL_OP_NO_SSLv2;

		else if	(strcmp(*argv,"-no_comp") == 0)

			{ off|=SSL_OP_NO_COMPRESSION; }

		else if (strcmp(*argv,"-serverpref") == 0)

		else if (strcmp(*argv,"-serverpref") == 0)

			off|=SSL_OP_CIPHER_SERVER_PREFERENCE;

			off|=SSL_OP_CIPHER_SERVER_PREFERENCE;

		else if	(strcmp(*argv,"-cipher") == 0)

		else if	(strcmp(*argv,"-cipher") == 0)

apps/s_server.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -754,6 +754,8 @@ int MAIN(int argc, char *argv[]) 
			{ off|=SSL_OP_NO_SSLv3; }

			{ off|=SSL_OP_NO_SSLv3; }

		else if	(strcmp(*argv,"-no_tls1") == 0)

		else if	(strcmp(*argv,"-no_tls1") == 0)

			{ off|=SSL_OP_NO_TLSv1; }

			{ off|=SSL_OP_NO_TLSv1; }

		else if	(strcmp(*argv,"-no_comp") == 0)

			{ off|=SSL_OP_NO_COMPRESSION; }

#ifndef OPENSSL_NO_SSL2

#ifndef OPENSSL_NO_SSL2

		else if	(strcmp(*argv,"-ssl2") == 0)

		else if	(strcmp(*argv,"-ssl2") == 0)

			{ meth=SSLv2_server_method(); }

			{ meth=SSLv2_server_method(); }

ssl/s23_clnt.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,8 @@ static int ssl23_client_hello(SSL *s) 
			p+=i;

			p+=i;





			/* COMPRESSION */

			/* COMPRESSION */

			if (s->ctx->comp_methods == NULL)

			if ((s->options & SSL_OP_NO_COMPRESSION)

						|| !s->ctx->comp_methods)

				j=0;

				j=0;

			else

			else

				j=sk_SSL_COMP_num(s->ctx->comp_methods);

				j=sk_SSL_COMP_num(s->ctx->comp_methods);

ssl/s3_both.c

+21 −7
Original line number Original line Diff line number Diff line
@@ -589,16 +589,22 @@ int ssl_verify_alarm_type(long type) 
int ssl3_setup_buffers(SSL *s)

int ssl3_setup_buffers(SSL *s)

	{

	{

	unsigned char *p;

	unsigned char *p;

	unsigned int extra;

	size_t len;

	size_t len;





	if (s->s3->rbuf.buf == NULL)

	if (s->s3->rbuf.buf == NULL)

		{

		{

		len = SSL3_RT_MAX_PLAIN_LENGTH

			+ SSL3_RT_MAX_ENCRYPTED_OVERHEAD

			+ SSL3_RT_HEADER_LENGTH;

		if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)

		if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)

			extra=SSL3_RT_MAX_EXTRA;

			{

		else

			s->s3->init_extra = 1;

			extra=0;

			len += SSL3_RT_MAX_EXTRA;

		len = SSL3_RT_MAX_PACKET_SIZE + extra;

			}

#ifndef OPENSSL_NO_COMP

		if (!(s->options & SSL_OP_NO_COMPRESSION))

			len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;

#endif

		if ((p=OPENSSL_malloc(len)) == NULL)

		if ((p=OPENSSL_malloc(len)) == NULL)

			goto err;

			goto err;

		s->s3->rbuf.buf = p;

		s->s3->rbuf.buf = p;
@@ -607,8 +613,16 @@ int ssl3_setup_buffers(SSL *s) 




	if (s->s3->wbuf.buf == NULL)

	if (s->s3->wbuf.buf == NULL)

		{

		{

		len = SSL3_RT_MAX_PACKET_SIZE;

		len = s->max_send_fragment

		len += SSL3_RT_HEADER_LENGTH + 256; /* extra space for empty fragment */

			+ SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD

			+ SSL3_RT_HEADER_LENGTH;

#ifndef OPENSSL_NO_COMP

		if (!(s->options & SSL_OP_NO_COMPRESSION))

			len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;

#endif

		if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))

			len += SSL3_RT_HEADER_LENGTH

				+ SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;

		if ((p=OPENSSL_malloc(len)) == NULL)

		if ((p=OPENSSL_malloc(len)) == NULL)

			goto err;

			goto err;

		s->s3->wbuf.buf = p;

		s->s3->wbuf.buf = p;