summaryrefslogtreecommitdiffstats
path: root/ssl/s3_enc.c
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
committerBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
commitd886975835e7e430aeda6ecb1653363b463bc9cf (patch)
tree03ec369d422a0585dc36abb091a4d96ed90e128f /ssl/s3_enc.c
parent22872a536328f52f3cbed8607107d7afbc8881f0 (diff)
Fix gcc 4.6 warnings. Check TLS server hello extension length.
Diffstat (limited to 'ssl/s3_enc.c')
-rw-r--r--ssl/s3_enc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 06e54666b2..1539a4ce1c 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -191,7 +191,7 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
int ssl3_change_cipher_state(SSL *s, int which)
{
- unsigned char *p,*key_block,*mac_secret;
+ unsigned char *p,*mac_secret;
unsigned char exp_key[EVP_MAX_KEY_LENGTH];
unsigned char exp_iv[EVP_MAX_IV_LENGTH];
unsigned char *ms,*key,*iv,*er1,*er2;
@@ -214,7 +214,6 @@ int ssl3_change_cipher_state(SSL *s, int which)
else
comp=s->s3->tmp.new_compression->method;
#endif
- key_block=s->s3->tmp.key_block;
if (which & SSL3_CC_READ)
{