aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/d1_enc.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
commita3ddd25abaadeab1a1bdbac75385d53ba5beb7e1 (patch)
tree5691801dabb6a06320a55f5ce8ed927af41514f3 /crypto/openssl/ssl/d1_enc.c
parentf7842e00f57fe6cfa3b337fbf078cad9fe291188 (diff)
parentf2c43d19b91f8847c1dfd87721254b44f963d9a2 (diff)
downloadsrc-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.tar.gz
src-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.zip
Merge OpenSSL 0.9.8p into head.
Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
Notes
Notes: svn path=/head/; revision=215697
Diffstat (limited to 'crypto/openssl/ssl/d1_enc.c')
-rw-r--r--crypto/openssl/ssl/d1_enc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/openssl/ssl/d1_enc.c b/crypto/openssl/ssl/d1_enc.c
index 3dfa5adba3f9..4a6c9090314d 100644
--- a/crypto/openssl/ssl/d1_enc.c
+++ b/crypto/openssl/ssl/d1_enc.c
@@ -131,13 +131,11 @@ int dtls1_enc(SSL *s, int send)
SSL3_RECORD *rec;
EVP_CIPHER_CTX *ds;
unsigned long l;
- int bs,i,ii,j,k,n=0;
+ int bs,i,ii,j,k;
const EVP_CIPHER *enc;
if (send)
{
- if (s->write_hash != NULL)
- n=EVP_MD_size(s->write_hash);
ds=s->enc_write_ctx;
rec= &(s->s3->wrec);
if (s->enc_write_ctx == NULL)
@@ -158,8 +156,6 @@ int dtls1_enc(SSL *s, int send)
}
else
{
- if (s->read_hash != NULL)
- n=EVP_MD_size(s->read_hash);
ds=s->enc_read_ctx;
rec= &(s->s3->rrec);
if (s->enc_read_ctx == NULL)