diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-09-13 08:40:27 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-09-13 22:37:52 +0000 |
| commit | cd95e197ca78feb1e83ec737b87ada0a1dd57d10 (patch) | |
| tree | 7d54d8cc9b6170acff8ca618b6d0eb5fa439f4f6 /ui/qt/main_window.h | |
| parent | 63743a3733441a4f54ca6216ad63654bb3012824 (diff) | |
Start renaming SSL to TLS.
Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS"
over "SSL" in user interface text and in the documentation.
Fix the test_tls_master_secret test while we're here.
Bug: 14922
Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8
Reviewed-on: https://code.wireshark.org/review/29649
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index fc8f923fd4..b732bcf82a 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -442,7 +442,7 @@ private slots: void on_actionFilePrint_triggered(); void on_actionFileExportPDU_triggered(); - void on_actionFileExportSSLSessionKeys_triggered(); + void on_actionFileExportTLSSessionKeys_triggered(); void actionEditCopyTriggered(MainWindow::CopySelected selection_type); void on_actionCopyAllVisibleItems_triggered(); @@ -546,7 +546,7 @@ private slots: void openFollowStreamDialog(follow_type_t type, int stream_num = -1); void on_actionAnalyzeFollowTCPStream_triggered(); void on_actionAnalyzeFollowUDPStream_triggered(); - void on_actionAnalyzeFollowSSLStream_triggered(); + void on_actionAnalyzeFollowTLSStream_triggered(); void on_actionAnalyzeFollowHTTPStream_triggered(); void statCommandExpertInfo(const char *, void *); void on_actionAnalyzeExpertInfo_triggered(); |