diff -r 6d278f426417 Lib/ssl.py --- a/Lib/ssl.py Fri Jul 05 18:05:29 2013 -1000 +++ b/Lib/ssl.py Sun Jul 07 15:47:45 2013 +0200 @@ -402,6 +402,10 @@ Return zero-length string on EOF.""" self._checkClosed() + + if not self._sslobj: + raise ValueError("Read on closed SSL socket.") + try: if buffer is not None: v = self._sslobj.read(len, buffer) @@ -422,6 +426,10 @@ number of bytes of DATA actually transmitted.""" self._checkClosed() + + if not self._sslobj: + raise ValueError("Write on closed SSL socket.") + return self._sslobj.write(data) def getpeercert(self, binary_form=False): diff -r 6d278f426417 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Fri Jul 05 18:05:29 2013 -1000 +++ b/Lib/test/test_ssl.py Sun Jul 07 15:47:45 2013 +0200 @@ -2311,6 +2311,21 @@ self.assertEqual(cm.exception.reason, 'TLSV1_ALERT_INTERNAL_ERROR') self.assertIn("TypeError", stderr.getvalue()) + def test_read_write_after_close_raises_valuerror(self): + context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + context.verify_mode = ssl.CERT_REQUIRED + context.load_verify_locations(CERTFILE) + context.load_cert_chain(CERTFILE) + server = ThreadedEchoServer(context=context, chatty=False) + + with server: + s = context.wrap_socket(socket.socket()) + s.connect((HOST, server.port)) + s.close() + + self.assertRaises(ValueError, s.read, 1024) + self.assertRaises(ValueError, s.write, 'hello') + def test_main(verbose=False): if support.verbose: