diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-07-09 08:49:09 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-07-09 08:49:09 +0000 |
| commit | d1d0be3cd26458f36692b7b7dbe58b89d8bc8b44 (patch) | |
| tree | 7d394bec6079774b5dae5c6d2d6d4d9c465170f6 /ssl/s3_enc.c | |
| parent | 2c8ad4f1af8ac7ac1146249c462538fee82cceac (diff) | |
emtpy fragments are not necessary for SSL_eNULL
(but noone uses it anyway)
fix t1_enc.c: use OPENSSL_NO_RC4, not NO_RC4
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 72ac8b6913..2bb5be49f1 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -385,10 +385,16 @@ int ssl3_setup_key_block(SSL *s) */ 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 - 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_RC4) + s->s3->need_empty_fragments = 0; #endif + } } return ret; |