More KNF.

1 files changed, 56 insertions, 46 deletions

diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c
index eac134a1ee..d18b8f6f5e 100644
--- a/src/lib/libcrypto/asn1/x_pkey.c
+++ b/src/lib/libcrypto/asn1/x_pkey.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -64,75 +64,85 @@
 #include <openssl/x509.h>
 
 /* need to implement */
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
+int
+i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
 {
-        return(0);
+        return (0);
 }
 
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length)
+X509_PKEY *
+d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length)
 {
         int i;
-        M_ASN1_D2I_vars(a,X509_PKEY *,X509_PKEY_new);
+        M_ASN1_D2I_vars(a, X509_PKEY *, X509_PKEY_new);
 
         M_ASN1_D2I_Init();
         M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_x(X509_ALGOR,ret->enc_algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get_x(ASN1_OCTET_STRING,ret->enc_pkey,d2i_ASN1_OCTET_STRING);
+        M_ASN1_D2I_get_x(X509_ALGOR, ret->enc_algor, d2i_X509_ALGOR);
+        M_ASN1_D2I_get_x(ASN1_OCTET_STRING, ret->enc_pkey,
+            d2i_ASN1_OCTET_STRING);
 
-        ret->cipher.cipher=EVP_get_cipherbyname(
-                OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm)));
+        ret->cipher.cipher = EVP_get_cipherbyname(
+            OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm)));
         if (ret->cipher.cipher == NULL) {
-                c.error=ASN1_R_UNSUPPORTED_CIPHER;
-                c.line=__LINE__;
+                c.error = ASN1_R_UNSUPPORTED_CIPHER;
+                c.line = __LINE__;
                 goto err;
         }
         if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) {
-                i=ret->enc_algor->parameter->value.octet_string->length;
+                i = ret->enc_algor->parameter->value.octet_string->length;
                 if (i > EVP_MAX_IV_LENGTH) {
-                        c.error=ASN1_R_IV_TOO_LARGE;
-                        c.line=__LINE__;
+                        c.error = ASN1_R_IV_TOO_LARGE;
+                        c.line = __LINE__;
                         goto err;
                 }
                 memcpy(ret->cipher.iv,
-                        ret->enc_algor->parameter->value.octet_string->data,i);
-        }
-        else
-                memset(ret->cipher.iv,0,EVP_MAX_IV_LENGTH);
-        M_ASN1_D2I_Finish(a,X509_PKEY_free,ASN1_F_D2I_X509_PKEY);
+                    ret->enc_algor->parameter->value.octet_string->data, i);
+        } else
+                memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH);
+        M_ASN1_D2I_Finish(a, X509_PKEY_free, ASN1_F_D2I_X509_PKEY);
 }
 
-X509_PKEY *X509_PKEY_new(void)
+X509_PKEY *
+X509_PKEY_new(void)
 {
-        X509_PKEY *ret=NULL;
+        X509_PKEY *ret = NULL;
         ASN1_CTX c;
 
-        M_ASN1_New_Malloc(ret,X509_PKEY);
-        ret->version=0;
-        M_ASN1_New(ret->enc_algor,X509_ALGOR_new);
-        M_ASN1_New(ret->enc_pkey,M_ASN1_OCTET_STRING_new);
-        ret->dec_pkey=NULL;
-        ret->key_length=0;
-        ret->key_data=NULL;
-        ret->key_free=0;
-        ret->cipher.cipher=NULL;
-        memset(ret->cipher.iv,0,EVP_MAX_IV_LENGTH);
-        ret->references=1;
-        return(ret);
+        M_ASN1_New_Malloc(ret, X509_PKEY);
+        ret->version = 0;
+        M_ASN1_New(ret->enc_algor, X509_ALGOR_new);
+        M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new);
+        ret->dec_pkey = NULL;
+        ret->key_length = 0;
+        ret->key_data = NULL;
+        ret->key_free = 0;
+        ret->cipher.cipher = NULL;
+        memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH);
+        ret->references = 1;
+        return (ret);
         M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW);
 }
 
-void X509_PKEY_free(X509_PKEY *x)
+void
+X509_PKEY_free(X509_PKEY *x)
 {
         int i;
 
-        if (x == NULL) return;
+        if (x == NULL)
+                return;
 
-        i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_X509_PKEY);
-        if (i > 0) return;
+        i = CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_PKEY);
+        if (i > 0)
+                return;
 
-        if (x->enc_algor != NULL) X509_ALGOR_free(x->enc_algor);
-        if (x->enc_pkey != NULL) M_ASN1_OCTET_STRING_free(x->enc_pkey);
-        if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey);
-        if ((x->key_data != NULL) && (x->key_free)) free(x->key_data);
+        if (x->enc_algor != NULL)
+                X509_ALGOR_free(x->enc_algor);
+        if (x->enc_pkey != NULL)
+                M_ASN1_OCTET_STRING_free(x->enc_pkey);
+        if (x->dec_pkey != NULL)
+                EVP_PKEY_free(x->dec_pkey);
+        if ((x->key_data != NULL) && (x->key_free))
+                free(x->key_data);
         free(x);
 }