diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-06-11 20:16:42 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-06-11 20:16:42 (GMT) |
commit | 2e1b7fc998e1744eeb3bb31b131eba0145b88a2f (patch) | |
tree | 1c6fb1125b31b8596ac3c53625afa2f3601edd5e | |
parent | 391f1a425241794668b8ca5cb004e7457d0f2a7e (diff) | |
download | cpython-2e1b7fc998e1744eeb3bb31b131eba0145b88a2f.zip cpython-2e1b7fc998e1744eeb3bb31b131eba0145b88a2f.tar.gz cpython-2e1b7fc998e1744eeb3bb31b131eba0145b88a2f.tar.bz2 |
raise an error when STARTTLS fails
-rwxr-xr-x | Lib/smtplib.py | 5 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 8388b98..e1651c0 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -656,6 +656,11 @@ class SMTP: self.ehlo_resp = None self.esmtp_features = {} self.does_esmtp = 0 + else: + # RFC 3207: + # 501 Syntax error (no parameters allowed) + # 454 TLS not available due to temporary reason + raise SMTPResponseException(resp, reply) return (resp, reply) def sendmail(self, from_addr, to_addrs, msg, mail_options=[], @@ -92,6 +92,9 @@ Core and Builtins Library ------- +- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772. Reported by Team + Oststrom + - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the locale. |