Commit 4de920c9 authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Do not store unneeded data.

parent 3cd039dd

CHANGES

+5 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,11 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only

         +) applies to 0.9.7 only





  +) Do not store session data into the internal session cache, if it

     is never intended to be looked up (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP

     flag is set). Proposed by Aslam <aslam@funk.com>.

     [Lutz Jaenicke]



  +) Support for crypto accelerator cards from Accelerated Encryption

  +) Support for crypto accelerator cards from Accelerated Encryption

     Processing, www.aep.ie.  (Use engine 'aep')

     Processing, www.aep.ie.  (Use engine 'aep')

     The support was copied from 0.9.6c [engine] and adapted/corrected

     The support was copied from 0.9.6c [engine] and adapted/corrected

ssl/ssl_lib.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1646,9 +1646,10 @@ void ssl_update_cache(SSL *s,int mode) 
	 * and it would be rather hard to do anyway :-) */

	 * and it would be rather hard to do anyway :-) */

	if (s->session->session_id_length == 0) return;

	if (s->session->session_id_length == 0) return;





	if ((s->ctx->session_cache_mode & mode)

	i=s->ctx->session_cache_mode;

		&& (!s->hit)

	if ((i & mode) && (!s->hit)

		&& SSL_CTX_add_session(s->ctx,s->session)

		&& ((i & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)

		    || SSL_CTX_add_session(s->ctx,s->session))

		&& (s->ctx->new_session_cb != NULL))

		&& (s->ctx->new_session_cb != NULL))

		{

		{

		CRYPTO_add(&s->session->references,1,CRYPTO_LOCK_SSL_SESSION);

		CRYPTO_add(&s->session->references,1,CRYPTO_LOCK_SSL_SESSION);
@@ -1657,7 +1658,6 @@ void ssl_update_cache(SSL *s,int mode) 
		}

		}





	/* auto flush every 255 connections */

	/* auto flush every 255 connections */

	i=s->ctx->session_cache_mode;

	if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) &&

	if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) &&

		((i & mode) == mode))

		((i & mode) == mode))

		{

		{