[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5f9a52dc951b9358da9ea7a91a47b3c3f83461e8
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5f9a52d by Kevin Grigorenko (kevin.grigorenko@xxxxxxxxxx):

    SSL: Add support for private key password when decrypting
    SSL traffic from tshark with -o ssl.keys_list.
    
    
    For example, as used in a new test also added in this commit:
    
    -o "ssl.keys_list: 127.0.0.1,9131,http,$TEST_KEYS_DIR/key.p12,WebAS"
    
    Change-Id: Ia6960fa4ae88182277f6d22d84ec9170ea74d54e
    Reviewed-on: https://code.wireshark.org/review/8746
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  fde38c0   [MSVC 2015] Try to fix warinings turned errors.
    adds  5f9a52d   SSL: Add support for private key password when decrypting SSL traffic from tshark with -o ssl.keys_list.


Summary of changes:
 epan/dissectors/packet-ssl.c |    7 ++++---
 test/captures/dmgr.pcapng    |  Bin 0 -> 20452 bytes
 test/keys/key.p12            |  Bin 0 -> 3842 bytes
 test/suite-decryption.sh     |   15 +++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 test/captures/dmgr.pcapng
 create mode 100755 test/keys/key.p12