commit 6ace478989f75732ff81e57d1938f2baa074a80f
author Jean-Paul Calderone <exarkun@divmod.com> Thu Sep 09 18:43:40 2010 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Thu Sep 09 18:43:40 2010 -0400
tree 9b840be15a219039f8a753bd10e868ed87e2925e
parent 0294e3de886135c19423cd3e6d05bc8d7b36aa71

Sort of add a load_tmp_dh test; also a Context.set_cipher_list test

OpenSSL/ssl/context.c

diff --git a/OpenSSL/ssl/context.c b/OpenSSL/ssl/context.c
index c8100b4..ef59961 100644
--- a/OpenSSL/ssl/context.c
+++ b/OpenSSL/ssl/context.c
@@ -762,8 +762,10 @@
         return NULL;
 
     bio = BIO_new_file(dhfile, "r");
-    if (bio == NULL)
-        return PyErr_NoMemory();
+    if (bio == NULL) {
+        exception_from_error_queue(ssl_Error);
+        return NULL;
+    }
 
     dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
     SSL_CTX_set_tmp_dh(self->ctx, dh);