diff -r 6e2f02b59fcf Misc/NEWS
--- a/Misc/NEWS	Mon Jun 24 20:38:46 2013 +0100
+++ b/Misc/NEWS	Mon Jun 24 22:19:39 2013 +0200
@@ -38,9 +38,9 @@ Core and Builtins
 Library
 -------
 
-- Issue #18135: Fix a possible integer overflow in ssl.SSLSocket.write()
-  and in ssl.SSLContext.load_cert_chain() for strings and passwords longer than
-  2 gigabytes.
+- Issue #18135: ssl.SSLSocket.write() now raises an OverflowError if the input
+  string in longer than 2 gigabytes. ssl.SSLContext.load_cert_chain() now
+  raises a ValueError if the password is longer than 2 gigabytes.
 
 - Issue #18248: Fix libffi build on AIX.
 
diff -r 6e2f02b59fcf Modules/_ssl.c
--- a/Modules/_ssl.c	Mon Jun 24 20:38:46 2013 +0100
+++ b/Modules/_ssl.c	Mon Jun 24 22:19:39 2013 +0200
@@ -1264,6 +1264,12 @@ static PyObject *PySSL_SSLwrite(PySSLSoc
         return NULL;
     }
 
+    if (buf.len > INT_MAX) {
+        PyErr_Format(PyExc_OverflowError,
+                     "string longer than %d bytes", INT_MAX);
+        goto error;
+    }
+
     /* just in case the blocking state of the socket has been changed */
     nonblocking = (sock->sock_timeout >= 0.0);
     BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking);
@@ -1284,9 +1290,8 @@ static PyObject *PySSL_SSLwrite(PySSLSoc
         goto error;
     }
     do {
-        len = (int)Py_MIN(buf.len, INT_MAX);
         PySSL_BEGIN_ALLOW_THREADS
-        len = SSL_write(self->ssl, buf.buf, len);
+        len = SSL_write(self->ssl, buf.buf, (int)buf.len);
         err = SSL_get_error(self->ssl, len);
         PySSL_END_ALLOW_THREADS
         if (PyErr_CheckSignals()) {