diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 17:24:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 17:24:59 +0100 |
| commit | 50443df3404e660984c5bbfd999dc96d0bc9b1b2 (patch) | |
| tree | 58a1636284b7a933b7c483531723f780f77e6efc /docs/src/content/howto-wireshark-tls.md | |
| parent | 3eebfed79f4d54840a054c2dc5061e155c416d3e (diff) | |
| parent | f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793 (diff) | |
| download | mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.gz mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.bz2 mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.zip | |
Merge branch 'master' into master
Diffstat (limited to 'docs/src/content/howto-wireshark-tls.md')
| -rw-r--r-- | docs/src/content/howto-wireshark-tls.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/src/content/howto-wireshark-tls.md b/docs/src/content/howto-wireshark-tls.md index 588223ac..a55d177b 100644 --- a/docs/src/content/howto-wireshark-tls.md +++ b/docs/src/content/howto-wireshark-tls.md @@ -7,7 +7,7 @@ menu: # Wireshark and SSL/TLS Master Secrets -The SSL/SSL master keys can be logged by mitmproxy so that external programs can +The SSL/TLS master keys can be logged by mitmproxy so that external programs can decrypt SSL/TLS connections both from and to the proxy. Recent versions of Wireshark can use these log files to decrypt packets. See the [Wireshark wiki](https://wiki.wireshark.org/SSL#Using_the_.28Pre.29-Master-Secret) for more information. |