Merge lp:~songofacandy/pyopenssl/allow_thread_while_keygen into lp:~exarkun/pyopenssl/trunk

[methane]

Generating key may use few seconds.
This proposal allows other threads runs while generating key.

[lp:~songofacandy/pyopenssl/allow_thread_while_keygen]

158. By methane on 2011-08-25

Fix didn't release while DSA key generation.

159. By methane on 2011-08-25

Fix compile error

=== modified file 'OpenSSL/crypto/pkey.c'
--- OpenSSL/crypto/pkey.c	2011-06-12 22:10:01 +0000
+++ OpenSSL/crypto/pkey.c	2011-08-25 17:40:26 +0000
@@ -52,17 +52,27 @@
                 PyErr_SetString(PyExc_ValueError, "Invalid number of bits");
                 return NULL;
             }
-            if ((rsa = RSA_generate_key(bits, 0x10001, NULL, NULL)) == NULL)
+            Py_BEGIN_ALLOW_THREADS;
+            rsa = RSA_generate_key(bits, 0x10001, NULL, NULL);
+            Py_END_ALLOW_THREADS;
+            if (rsa == NULL)
                 FAIL();
             if (!EVP_PKEY_assign_RSA(self->pkey, rsa))
                 FAIL();
 	    break;
 
         case crypto_TYPE_DSA:
-            if ((dsa = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL)) == NULL)
-                FAIL();
-            if (!DSA_generate_key(dsa))
-                FAIL();
+            Py_BEGIN_ALLOW_THREADS;
+            dsa = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL);
+            if (dsa == NULL) {
+                Py_BLOCK_THREADS;
+                FAIL();
+            }
+            if (!DSA_generate_key(dsa)) {
+                Py_BLOCK_THREADS;
+                FAIL();
+            }
+            Py_END_ALLOW_THREADS;
             if (!EVP_PKEY_assign_DSA(self->pkey, dsa))
                 FAIL();
 	    break;