diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 18:10:42 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 18:10:42 +0100 |
| commit | 0873566ff05c02be063f3aa15adecb725342119c (patch) | |
| tree | a6dcddf0f0c08c9ff9cdd89e1f95196af2ff5a6a /docs/src/content/howto-wireshark-tls.md | |
| parent | d852f292c9a45de7f45cc8537f2aef217259017e (diff) | |
| parent | fbbbbb678e77e3cff5ab35b1fd55e85e875ed3f5 (diff) | |
| download | mitmproxy-0873566ff05c02be063f3aa15adecb725342119c.tar.gz mitmproxy-0873566ff05c02be063f3aa15adecb725342119c.tar.bz2 mitmproxy-0873566ff05c02be063f3aa15adecb725342119c.zip | |
Merge remote-tracking branch 'origin/master' into pr-3448
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. |