diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-03-17 19:11:45 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-20 23:51:10 +0000 |
| commit | f033925557c6d91d00273de4d0e3ddad5ab21d87 (patch) | |
| tree | f3fd7ae04100d25d00b5060752c22a8fd6bf822c /epan/dissectors/packet-ssl-utils.c | |
| parent | c0d6b0ec313432af1f377f696f37746ad7a84cef (diff) | |
| download | wireshark-f033925557c6d91d00273de4d0e3ddad5ab21d87.tar.gz | |
TLS13: fix key expansion for AES256
"key_len" refers to the key length of an algorithm, not the block size.
For AES128 both are the same, but for AES256 it is different.
Change-Id: Ic657265d90323eb224b133b23232cb809264ab64
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/20598
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index d9bd14052e..b19eedf963 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3505,7 +3505,7 @@ tls13_generate_keys(SslDecryptSession *ssl_session, const StringInfo *secret, gb return FALSE; } - key_length = (guint) gcry_cipher_get_algo_blklen(cipher_algo); + key_length = (guint) gcry_cipher_get_algo_keylen(cipher_algo); /* AES-GCM/AES-CCM/Poly1305-ChaCha20 all have N_MIN=N_MAX = 12. */ iv_length = 12; ssl_debug_printf("%s key_length %u iv_length %u\n", G_STRFUNC, key_length, iv_length); |