Wireshark-commits: [Wireshark-commits] master 9feb7fb: Fix build without GnuTLS
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 31 Jan 2019 13:14:29 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9feb7fb5225765aa2eba97e33b169727a376931d
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

9feb7fb by Peter Wu (peter@xxxxxxxxxxxxx):

    Fix build without GnuTLS
    
    The RSA Keys API and GUI are only functional when GnuTLS support is
    available. Be sure to hide the functions in the header and hide the
    preferences panel when GnuTLS support is missing.
    
    Change-Id: I0a52ab142c4d45b8186780ea9b1645542dcc6305
    Fixes: v2.9.1rc0-585-gec8f506c4b ("Qt: add initial RSA Keys preference frame")
    Reviewed-on: https://code.wireshark.org/review/31837
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  7b04a4f   QUIC: put coalesced packets in separate trees
     add  9feb7fb   Fix build without GnuTLS


Summary of changes:
 epan/secrets.h               | 2 +-
 ui/qt/models/pref_models.cpp | 2 ++
 ui/qt/preferences_dialog.cpp | 4 ++++
 ui/qt/rsa_keys_frame.cpp     | 8 ++++++--
 ui/qt/rsa_keys_frame.h       | 4 ++++
 5 files changed, 17 insertions(+), 3 deletions(-)