Wireshark-commits: [Wireshark-commits] master-1.12 239c02b: Allocate the unwrapped key in AES_unwra
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=239c02b10b67c9bd853293d444c069a1ffbcbe60
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
239c02b by Guy Harris (guy@xxxxxxxxxxxx):
Allocate the unwrapped key in AES_unwrap().
Have it allocate the buffer for the unwrapped key and return a pointer
to it, rather than having it be handed a buffer for that key.
That makes it a bit easier to validate, in AES_unwrap, that we don't
write past the end of the buffer.
Change-Id: Id02852c23054b3ed33eeeb383e7aa6cf12d02ed9
Reviewed-on: https://code.wireshark.org/review/8371
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 1507b4a4170f758d9c1fcd5f9ae9e39c8a801c0b)
Reviewed-on: https://code.wireshark.org/review/12783
Actions performed:
from b2c9e5a Define the SHA-1 digest length in wsutil/sha1.h and use it.
adds 239c02b Allocate the unwrapped key in AES_unwrap().
Summary of changes:
epan/crypt/airpdcap.c | 6 ++----
epan/crypt/airpdcap_rijndael.c | 19 +++++++++++--------
epan/crypt/airpdcap_rijndael.h | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)