[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/9e99a96d6ac3
changeset:   101889:9e99a96d6ac3
parent:      101885:83e956f309c8
parent:      101888:c71c6a3a8097
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 11 13:19:34 2016 -0700
summary:
  merge 3.5

files:
  Lib/smtplib.py |  5 +++++
  Misc/NEWS      |  3 +++
  2 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -773,6 +773,11 @@
             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=[],
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@
 - Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__.
   Patch by Gareth Rees.
 
+- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772.  Reported by Team
+  Oststrom
+
 - Issue #21386: Implement missing IPv4Address.is_global property.  It was
   documented since 07a5610bae9d.  Initial patch by Roger Luethi.
 

-- 
Repository URL: https://hg.python.org/cpython