commit 1a71a4ab1efe0635817383708046a16850666a60
author Ziga Seilnacht <ziga.seilnacht@gmail.com> Tue Dec 22 17:02:04 2009 +0100
committer Jean-Paul Calderone <exarkun@divmod.com> Tue Dec 22 17:02:04 2009 +0100
tree 8e967f16c18d0ef26a49a26855122f5acbf911b8
parent cd48be9bac3a3e66a53b1942477db03dc5b49ad3

Unify code formatting in recently changed functions to what seems to be the currently preferred style.

OpenSSL/crypto/crypto.c

diff --git a/OpenSSL/crypto/crypto.c b/OpenSSL/crypto/crypto.c
index d642dc6..ad35ce9 100644
--- a/OpenSSL/crypto/crypto.c
+++ b/OpenSSL/crypto/crypto.c
@@ -50,10 +50,10 @@
     }
     ret = PyEval_CallObject(func, argv);
     Py_DECREF(argv);
-    if (ret == NULL)
+    if (ret == NULL) {
         return 0;
-    if (!PyBytes_Check(ret))
-    {
+    }
+    if (!PyBytes_Check(ret)) {
         Py_DECREF(ret);
         PyErr_SetString(PyExc_ValueError, "String expected");
         return 0;
@@ -135,9 +135,10 @@
     BIO *bio;
     EVP_PKEY *pkey;
 
-    if (!PyArg_ParseTuple(args, "is#|O:load_privatekey", &type, &buffer, &len, &pw))
+    if (!PyArg_ParseTuple(args, "is#|O:load_privatekey",
+                          &type, &buffer, &len, &pw)) {
         return NULL;
-
+    }
     if (!setup_callback(type, pw, &cb, &cb_arg)) {
         return NULL;
     }
@@ -147,8 +148,7 @@
         exception_from_error_queue(crypto_Error);
         return NULL;
     }
-    switch (type)
-    {
+    switch (type) {
         case X509_FILETYPE_PEM:
             pkey = PEM_read_bio_PrivateKey(bio, NULL, cb, cb_arg);
             break;
@@ -164,8 +164,7 @@
     }
     BIO_free(bio);
 
-    if (pkey == NULL)
-    {
+    if (pkey == NULL) {
         return raise_current_error();
     }
 
@@ -202,19 +201,16 @@
     crypto_PKeyObj *pkey;
 
     if (!PyArg_ParseTuple(args, "iO!|sO:dump_privatekey", &type,
-			  &crypto_PKey_Type, &pkey, &cipher_name, &pw))
+                          &crypto_PKey_Type, &pkey, &cipher_name, &pw)) {
         return NULL;
-
-    if (cipher_name != NULL && pw == NULL)
-    {
+    }
+    if (cipher_name != NULL && pw == NULL) {
         PyErr_SetString(PyExc_ValueError, "Illegal number of arguments");
         return NULL;
     }
-    if (cipher_name != NULL)
-    {
+    if (cipher_name != NULL) {
         cipher = EVP_get_cipherbyname(cipher_name);
-        if (cipher == NULL)
-        {
+        if (cipher == NULL) {
             PyErr_SetString(PyExc_ValueError, "Invalid cipher name");
             return NULL;
         }
@@ -228,8 +224,7 @@
         exception_from_error_queue(crypto_Error);
         return NULL;
     }
-    switch (type)
-    {
+    switch (type) {
         case X509_FILETYPE_PEM:
             ret = PEM_write_bio_PrivateKey(bio, pkey->pkey, cipher, NULL, 0, cb, cb_arg);
             break;
@@ -254,8 +249,7 @@
             return NULL;
     }
 
-    if (ret == 0)
-    {
+    if (ret == 0) {
         BIO_free(bio);
         return raise_current_error();
     }