[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_0_9_8fg-stable: openssl/ssl/ ssl_sess.c
From:       "Lutz Jaenicke" <jaenicke () openssl ! org>
Date:       2007-10-19 7:36:35
Message-ID: 20071019073635.10CC31EAE885 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Lutz Jaenicke
  Root:   /v/openssl/cvs                   Email:  jaenicke@openssl.org
  Module: openssl                          Date:   19-Oct-2007 09:36:34
  Branch: OpenSSL_0_9_8fg-stable           Handle: 2007101908363400

  Modified files:           (Branch: OpenSSL_0_9_8fg-stable)
    openssl/ssl             ssl_sess.c

  Log:
    Prepare OpenSSL 0.9.8g: cherry pick
      http://cvs.openssl.org/chngview?cn=16691
    Don't try to lookup zero length session.
    PR: 1591
    Submitted by: steve

  Summary:
    Revision    Changes     Path
    1.51.2.7.2.1+3  -1      openssl/ssl/ssl_sess.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/ssl/ssl_sess.c
  ============================================================================
  $ cvs diff -u -r1.51.2.7 -r1.51.2.7.2.1 ssl_sess.c
  --- openssl/ssl/ssl_sess.c	12 Aug 2007 18:59:03 -0000	1.51.2.7
  +++ openssl/ssl/ssl_sess.c	19 Oct 2007 07:36:34 -0000	1.51.2.7.2.1
  @@ -320,10 +320,12 @@
   		fatal = 1;
    		goto err;
   		}
  -	else if (r == 0)
  +	else if (r == 0 || (!ret && !len))
   		goto err;
   	else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
   #else
  +	if (len == 0)
  +		goto err;
   	if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
   #endif
   		{
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]