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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7017642d51ccda7258905041c33e5a50f7000c85
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

7017642 by Peter Wu (peter@xxxxxxxxxxxxx):

    tshark: recognize protocol aliases such as "-O ssl"
    
    Be sure to map "ssl" to "tls" instead of silently ignoring it.
    
    Change-Id: If1edc10ead4a9f25ee4802e1395390dc3c51796f
    Reviewed-on: https://code.wireshark.org/review/31894
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 4e112ab06bdaefa926d875dfeb67cb42e447c85d)
    Reviewed-on: https://code.wireshark.org/review/31902
    

Actions performed:

    from  8e8072f   editcap: warn when --inject-secrets is given a RSA private key
     add  7017642   tshark: recognize protocol aliases such as "-O ssl"


Summary of changes:
 tshark.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)