Merge fix for issue #11746

pitrou · pitrou · commit a7caec74aabe · 2011-04-03T18:16:50.000+02:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -87,6 +87,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve
+  private keys.
+
 - Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept
   file-like objects using a new ``fileobj`` constructor argument.  Patch by
   Nadeem Vawda.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -1620,7 +1620,7 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds)
         goto error;
     }
     PySSL_BEGIN_ALLOW_THREADS
-    r = SSL_CTX_use_RSAPrivateKey_file(self->ctx,
+    r = SSL_CTX_use_PrivateKey_file(self->ctx,
         PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes),
         SSL_FILETYPE_PEM);
     PySSL_END_ALLOW_THREADS

Original file line number	Diff line number	Diff line change
`@@ -1620,7 +1620,7 @@ load_cert_chain(PySSLContext self, PyObject args, PyObject *kwds)`
`1620`	`1620`	`goto error;`
`1621`	`1621`	`}`
`1622`	`1622`	`PySSL_BEGIN_ALLOW_THREADS`
`1623`		`- r = SSL_CTX_use_RSAPrivateKey_file(self->ctx,`
	`1623`	`+ r = SSL_CTX_use_PrivateKey_file(self->ctx,`
`1624`	`1624`	`PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes),`
`1625`	`1625`	`SSL_FILETYPE_PEM);`
`1626`	`1626`	`PySSL_END_ALLOW_THREADS`