trunk merge

Lib/test/test_ssl.py

@@ -1801,7 +1801,6 @@ else:
             context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
             context.verify_mode = ssl.CERT_REQUIRED
             context.load_verify_locations(SIGNING_CA)
-            context.verify_mode = ssl.CERT_REQUIRED
             context.verify_flags = ssl.VERIFY_DEFAULT
 
             # VERIFY_DEFAULT should pass

Modules/_ssl.c

@@ -2520,7 +2520,7 @@ _add_ca_certs(PySSLContext *self, void *data, Py_ssize_t len,
         return -1;
     }
 
-    biobuf = BIO_new_mem_buf(data, len);
+    biobuf = BIO_new_mem_buf(data, (int)len);
     if (biobuf == NULL) {
         _setSSLError("Can't allocate buffer", 0, __FILE__, __LINE__);
         return -1;

Modules/pyexpat.c

@@ -835,7 +835,8 @@ xmlparse_Parse(xmlparseobject *self, PyObject *args)
         s += MAX_CHUNK_SIZE;
         slen -= MAX_CHUNK_SIZE;
     }
-    rc = XML_Parse(self->itself, s, slen, isFinal);
+    assert(MAX_CHUNK_SIZE < INT_MAX && slen < INT_MAX);
+    rc = XML_Parse(self->itself, s, (int)slen, isFinal);
 
 done:
     if (view.buf != NULL)