[Python-checkins] cpython (merge 3.2 -> default): Merge fix for issue #11746

[antoine.pitrou]

http://hg.python.org/cpython/rev/c11e05a60d36
changeset:   69115:c11e05a60d36
parent:      69113:ff105faf1bac
parent:      69114:88ed3de28520
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Apr 03 18:16:50 2011 +0200
summary:
  Merge fix for issue #11746

files:
  Misc/NEWS      |  3 +++
  Modules/_ssl.c |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -87,6 +87,9 @@
 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
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1620,7 +1620,7 @@
         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

-- 
Repository URL: http://hg.python.org/cpython