changeset:   102320:4ef2404d343e
parent:      102317:bd90a39c9d66
parent:      102318:74856df7e55b
user:        Martin Panter <vadmium+py@gmail.com>
date:        Mon Jul 11 01:32:09 2016 +0000
files:       Lib/test/test_ssl.py Misc/NEWS Modules/_ssl.c
description:
Issue #23804: Merge SSL recv() fix from 3.5


diff -r bd90a39c9d66 -r 4ef2404d343e Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Sun Jul 10 20:30:43 2016 -0400
+++ b/Lib/test/test_ssl.py	Mon Jul 11 01:32:09 2016 +0000
@@ -2788,20 +2788,13 @@
                         # consume data
                         s.read()
 
+                # read(-1, buffer) is supported, even though read(-1) is not
                 data = b"data"
-
-                # read(-1, buffer) is supported, even though read(-1) is not
                 s.send(data)
                 buffer = bytearray(len(data))
                 self.assertEqual(s.read(-1, buffer), len(data))
                 self.assertEqual(buffer, data)
 
-                # recv/read(0) should return no data
-                s.send(data)
-                self.assertEqual(s.recv(0), b"")
-                self.assertEqual(s.read(0), b"")
-                self.assertEqual(s.read(), data)
-
                 # Make sure sendmsg et al are disallowed to avoid
                 # inadvertent disclosure of data and/or corruption
                 # of the encrypted data stream
@@ -2817,6 +2810,26 @@
 
                 s.close()
 
+        def test_recv_zero(self):
+            server = ThreadedEchoServer(CERTFILE)
+            server.__enter__()
+            self.addCleanup(server.__exit__, None, None)
+            s = socket.create_connection((HOST, server.port))
+            self.addCleanup(s.close)
+            s = ssl.wrap_socket(s, suppress_ragged_eofs=False)
+            self.addCleanup(s.close)
+
+            # recv/read(0) should return no data
+            s.send(b"data")
+            self.assertEqual(s.recv(0), b"")
+            self.assertEqual(s.read(0), b"")
+            self.assertEqual(s.read(), b"data")
+
+            # Should not block if the other end sends no data
+            s.setblocking(False)
+            self.assertEqual(s.recv(0), b"")
+            self.assertEqual(s.recv_into(bytearray()), 0)
+
         def test_nonblocking_send(self):
             server = ThreadedEchoServer(CERTFILE,
                                         certreqs=ssl.CERT_NONE,
diff -r bd90a39c9d66 -r 4ef2404d343e Misc/NEWS
--- a/Misc/NEWS	Sun Jul 10 20:30:43 2016 -0400
+++ b/Misc/NEWS	Mon Jul 11 01:32:09 2016 +0000
@@ -27,6 +27,9 @@
 Library
 -------
 
+- Issue #23804: Fix SSL zero-length recv() calls to not block and not raise
+  an error about unclean EOF.
+
 - Issue #27466: Change time format returned by http.cookie.time2netscape,
   confirming the netscape cookie format and making it consistent with
   documentation.
diff -r bd90a39c9d66 -r 4ef2404d343e Modules/_ssl.c
--- a/Modules/_ssl.c	Sun Jul 10 20:30:43 2016 -0400
+++ b/Modules/_ssl.c	Mon Jul 11 01:32:09 2016 +0000
@@ -1913,6 +1913,10 @@
         dest = PyBytes_FromStringAndSize(NULL, len);
         if (dest == NULL)
             goto error;
+        if (len == 0) {
+            Py_XDECREF(sock);
+            return dest;
+        }
         mem = PyBytes_AS_STRING(dest);
     }
     else {
@@ -1924,6 +1928,10 @@
                                 "maximum length can't fit in a C 'int'");
                 goto error;
             }
+            if (len == 0) {
+                count = 0;
+                goto done;
+            }
         }
     }