diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2012-04-03 14:50:30 -0400 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2012-04-03 14:50:30 -0400 |
| commit | cf141b18925da8889bd19c88fb39a3e705d3ae56 (patch) | |
| tree | ed9e62bcbce38dd487c3e9454ea628c1e3877d28 | |
| parent | 6d1f20c13705a40b0e4bb335fdf7228c3b4dfa0f (diff) | |
| download | pyopenssl-cf141b18925da8889bd19c88fb39a3e705d3ae56.tar.gz | |
Use braces for all code blocks, even short ones. Also, simplify the thread management around the DSA generation.
| -rw-r--r-- | OpenSSL/crypto/pkey.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSSL/crypto/pkey.c b/OpenSSL/crypto/pkey.c index 0c76f34..fc1cce5 100644 --- a/OpenSSL/crypto/pkey.c +++ b/OpenSSL/crypto/pkey.c @@ -55,26 +55,27 @@ crypto_PKey_generate_key(crypto_PKeyObj *self, PyObject *args) Py_BEGIN_ALLOW_THREADS; rsa = RSA_generate_key(bits, 0x10001, NULL, NULL); Py_END_ALLOW_THREADS; - if (rsa == NULL) + if (rsa == NULL) { FAIL(); - if (!EVP_PKEY_assign_RSA(self->pkey, rsa)) + } + if (!EVP_PKEY_assign_RSA(self->pkey, rsa)) { FAIL(); + } break; case crypto_TYPE_DSA: Py_BEGIN_ALLOW_THREADS; dsa = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL); + Py_END_ALLOW_THREADS; 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)) + if (!EVP_PKEY_assign_DSA(self->pkey, dsa)) { FAIL(); + } break; default: |