提交 d1d0be3c 编写于 作者: B Bodo Möller

emtpy fragments are not necessary for SSL_eNULL

(but noone uses it anyway)

fix t1_enc.c: use OPENSSL_NO_RC4, not NO_RC4
上级 2c8ad4f1
...@@ -385,10 +385,16 @@ int ssl3_setup_key_block(SSL *s) ...@@ -385,10 +385,16 @@ int ssl3_setup_key_block(SSL *s)
*/ */
s->s3->need_empty_fragments = 1; s->s3->need_empty_fragments = 1;
if (s->session->cipher != NULL)
{
if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_eNULL)
s->s3->need_empty_fragments = 0;
#ifndef OPENSSL_NO_RC4 #ifndef OPENSSL_NO_RC4
if ((s->session->cipher != NULL) && ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)) if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)
s->s3->need_empty_fragments = 0; s->s3->need_empty_fragments = 0;
#endif #endif
}
} }
return ret; return ret;
......
...@@ -490,10 +490,16 @@ printf("\nkey block\n"); ...@@ -490,10 +490,16 @@ printf("\nkey block\n");
*/ */
s->s3->need_empty_fragments = 1; s->s3->need_empty_fragments = 1;
#ifndef NO_RC4 if (s->session->cipher != NULL)
if ((s->session->cipher != NULL) && ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)) {
s->s3->need_empty_fragments = 0; if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_eNULL)
s->s3->need_empty_fragments = 0;
#ifndef OPENSSL_NO_RC4
if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)
s->s3->need_empty_fragments = 0;
#endif #endif
}
} }
return(1); return(1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册