Wireshark · Wireshark-commits: [Wireshark-commits] master-2.0 8ea823c: ssl-utils: Fix parsing pre-master-secrets in keylog-file

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8ea823c2dae0f385f04563b970ff34eb8ed553ac
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

8ea823c by Gergely Nagy (ngg@xxxxxx):

    ssl-utils: Fix parsing pre-master-secrets in keylog-file
    
    With "PMS_CLIENT_RANDOM xxxx yyyy" lines, only 32 byte long pre-master
    secrets could be entered, but they are 48 byte long for RSA and can be
    of any length for DHE cipher suites.
    
    When a line had the "RSA xxxx yyyy" format then yyyy was previously
    parsed with the <master_secret> regex group but it contains
    the pre-master secret, so now it is parsed with the <pms> group.
    This didn't cause a functional issue for RSA, but it couldn't be used
    where the pre-master secret isn't 48 byte long.
    
    After this change the regex will accept everything that was previously
    working.
    
    Change-Id: I71f43f3e9977a5e98758f387ad69893e8be0e27a
    Reviewed-on: https://code.wireshark.org/review/10923
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit a386fc99ac72b4cdb88cb3d26fd19d6251391b96)
    Reviewed-on: https://code.wireshark.org/review/11003
    

Actions performed:

    from  15d2ddd   Add the directory for QtMultimedia to the list of include directories.
    adds  8ea823c   ssl-utils: Fix parsing pre-master-secrets in keylog-file


Summary of changes:
 epan/dissectors/packet-ssl-utils.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)