diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-02-10 13:20:11 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-02-10 13:20:11 +0000 |
| commit | e8978fda0307b029652c18cc198cdaeea53cf5e5 (patch) | |
| tree | 1e0c8ef63459fd3cded42556807dbc9eeea99516 /epan/dissectors/packet-ssl-utils.c | |
| parent | fb49859e64d538e5e281f735980a3ee0d038f83b (diff) | |
From Paolo Abeni:
The attached patch fix bug 732.
The problem was in the client key dissection. On ssl v3 the encrypted
data is the whole record data, on tls v1 the encrypted data is preceded
by the 2 bytes length of the encrypted data itself.
svn path=/trunk/; revision=17244
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 0fa3149912..bf9305f396 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -505,6 +505,7 @@ ssl3_generate_export_iv(StringInfo* r1, SSL_MD5_CTX md5; guint8 tmp[16]; + memset(&md5, 0, sizeof(md5)); ssl_md5_init(&md5); ssl_md5_update(&md5,r1->data,r1->data_len); ssl_md5_update(&md5,r2->data,r2->data_len); @@ -530,6 +531,7 @@ ssl3_prf(StringInfo* secret, const char* usage, rnd1=r1; rnd2=r2; + memset(&md5,0,sizeof(md5)); ssl_md5_init(&md5); memset(&sha,0,sizeof(sha)); ssl_sha_init(&sha); @@ -729,6 +731,8 @@ ssl_generate_keyring_material(SslDecryptSession*ssl_session) SSL_MD5_CTX md5; ssl_debug_printf("ssl_generate_keyring_material MD5(client_random)\n"); + + memset(&md5, 0, sizeof(md5)); ssl_md5_init(&md5); ssl_md5_update(&md5,c_wk,ssl_session->cipher_suite.eff_bits/8); ssl_md5_update(&md5,ssl_session->client_random.data, |