diff options
| author | Jean-Paul Calderone <exarkun@divmod.com> | 2010-09-09 18:43:40 -0400 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@divmod.com> | 2010-09-09 18:43:40 -0400 |
| commit | 6ace478989f75732ff81e57d1938f2baa074a80f (patch) | |
| tree | 9b840be15a219039f8a753bd10e868ed87e2925e /OpenSSL/ssl/context.c | |
| parent | 0294e3de886135c19423cd3e6d05bc8d7b36aa71 (diff) | |
| download | pyopenssl-6ace478989f75732ff81e57d1938f2baa074a80f.tar.gz | |
Sort of add a load_tmp_dh test; also a Context.set_cipher_list test
Diffstat (limited to 'OpenSSL/ssl/context.c')
| -rw-r--r-- | OpenSSL/ssl/context.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ ssl_Context_load_tmp_dh(ssl_ContextObj *self, PyObject *args) 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); |