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
This commit is contained in:
parent
4875e097f1
commit
8c447031ad
@ -320,10 +320,12 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
|
|||||||
fatal = 1;
|
fatal = 1;
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
else if (r == 0)
|
else if (r == 0 || (!ret && !len))
|
||||||
goto err;
|
goto err;
|
||||||
else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
||||||
#else
|
#else
|
||||||
|
if (len == 0)
|
||||||
|
goto err;
|
||||||
if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user