summaryrefslogtreecommitdiffstats
path: root/ssl/s3_enc.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-06-15 17:25:15 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-06-15 17:25:15 +0000
commite97359435ee15e6d2c0580c76a58040e8dc3ce60 (patch)
tree01c3ecc781efc58b6efb927129cdfe511644a3d5 /ssl/s3_enc.c
parentafce9bcca15bbf4a015d3f678cec5501ca1092eb (diff)
Fix warnings (From HEAD, original patch by Ben).
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 3d7aec97a2..58386e1ba0 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -214,7 +214,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;
@@ -239,7 +239,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)
{