commit 3f79ceaf76cabb14228f63813a1101b6944fbf39
author Jean-Paul Calderone <exarkun@twistedmatrix.com> Fri Mar 09 14:56:35 2012 -0800
committer Jean-Paul Calderone <exarkun@twistedmatrix.com> Fri Mar 09 14:56:35 2012 -0800
tree 6250aa7288ebfaa70c556003ec21587d28ebf9d6
parent bc2c186728161ceff19e7fd6db1dfab907c723a4

Fix test_export_invalid with certain versions of OpenSSL.  Previously OpenSSL did the NULL check for us, now we do it.

OpenSSL/crypto/crl.c

diff --git a/OpenSSL/crypto/crl.c b/OpenSSL/crypto/crl.c
index 614a606..543708e 100644
--- a/OpenSSL/crypto/crl.c
+++ b/OpenSSL/crypto/crl.c
@@ -138,6 +138,16 @@
         return NULL;
     }
 
+    /* Some versions of OpenSSL check for this, but more recent versions seem
+     * not to.
+     */
+    if (!key->pkey->ameth) {
+        PyErr_SetString(
+            crypto_Error, "Cannot export with an unitialized key");
+        return NULL;
+    }
+
+
     bio = BIO_new(BIO_s_mem());
     tmptm = ASN1_TIME_new();
     if (!tmptm) {