提交 b57329ba 编写于 作者: D Dr. Stephen Henson

PR: 2085

Submitted by: Mike Frysinger <vapier@gentoo.org>
Approved by: steve@openssl.org

Change domd test to match 1.0.0+ version: check $MAKEDEPEND
ends in "gcc" to support cross compilers.
上级 d4be9289
...@@ -618,9 +618,15 @@ int ssl3_client_hello(SSL *s) ...@@ -618,9 +618,15 @@ int ssl3_client_hello(SSL *s)
buf=(unsigned char *)s->init_buf->data; buf=(unsigned char *)s->init_buf->data;
if (s->state == SSL3_ST_CW_CLNT_HELLO_A) if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
{ {
if ((s->session == NULL) || SSL_SESSION *sess = s->session;
(s->session->ssl_version != s->version) || if ((sess == NULL) ||
(s->session->not_resumable)) (sess->ssl_version != s->version) ||
#ifdef OPENSSL_NO_TLSEXT
!sess->session_id_length ||
#else
(!sess->session_id_length && !sess->tlsext_tick) ||
#endif
(sess->not_resumable))
{ {
if (!ssl_get_new_session(s,0)) if (!ssl_get_new_session(s,0))
goto err; goto err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册