projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change BIO_number_read and BIO_number_written() to be 64 bit
[oweals/openssl.git]
/
ssl
/
s3_enc.c
diff --git
a/ssl/s3_enc.c
b/ssl/s3_enc.c
index ea9042b1656043756dc58a4eab6eeff04efdfdfc..dd93e251ae727fc4139f2d3224c873e06bcb1ef5 100644
(file)
--- a/
ssl/s3_enc.c
+++ b/
ssl/s3_enc.c
@@
-206,7
+206,7
@@
static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
km += MD5_DIGEST_LENGTH;
}
km += MD5_DIGEST_LENGTH;
}
- OPENSSL_cleanse(smd,
SHA_DIGEST_LENGTH
);
+ OPENSSL_cleanse(smd,
sizeof(smd)
);
EVP_MD_CTX_cleanup(&m5);
EVP_MD_CTX_cleanup(&s1);
return 1;
EVP_MD_CTX_cleanup(&m5);
EVP_MD_CTX_cleanup(&s1);
return 1;
@@
-388,13
+388,15
@@
int ssl3_change_cipher_state(SSL *s, int which)
}
#endif
}
#endif
- OPENSSL_cleanse(
&(exp_key[0])
, sizeof(exp_key));
- OPENSSL_cleanse(
&(exp_iv[0])
, sizeof(exp_iv));
+ OPENSSL_cleanse(
exp_key
, sizeof(exp_key));
+ OPENSSL_cleanse(
exp_iv
, sizeof(exp_iv));
EVP_MD_CTX_cleanup(&md);
return (1);
err:
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE);
err2:
EVP_MD_CTX_cleanup(&md);
return (1);
err:
SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE);
err2:
+ OPENSSL_cleanse(exp_key, sizeof(exp_key));
+ OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
return (0);
}
return (0);
}
@@
-687,7
+689,7
@@
int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
s, s->msg_callback_arg);
}
#endif
s, s->msg_callback_arg);
}
#endif
- OPENSSL_cleanse(buf, sizeof
buf
);
+ OPENSSL_cleanse(buf, sizeof
(buf)
);
return (ret);
}
return (ret);
}