From: jsing <jsing@openbsd.org>
Date: Mon, 21 Apr 2014 15:44:13 +0000 (+0000)
Subject: More KNF.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=807bc0f932cee93f3ddf0975e88b18a78bb5131a;p=openbsd

More KNF.
---

diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c
index 9d5d8e714ca..c670ac2acb8 100644
--- a/lib/libcrypto/pem/pem_lib.c
+++ b/lib/libcrypto/pem/pem_lib.c
@@ -501,10 +501,10 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
 	}
 	header += 11;
 	if (*header != '4')
-		return(0);
+		return (0);
 	header++;
 	if (*header != ',')
-		return(0);
+		return (0);
 	header++;
 	if (strncmp(header, "ENCRYPTED", 9) != 0) {
 		PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED);
diff --git a/lib/libcrypto/pem/pem_pkey.c b/lib/libcrypto/pem/pem_pkey.c
index 9aaff6e5148..bcce39281e0 100644
--- a/lib/libcrypto/pem/pem_pkey.c
+++ b/lib/libcrypto/pem/pem_pkey.c
@@ -133,7 +133,7 @@ PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 		ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
 		if (!ameth || !ameth->old_priv_decode)
 			goto p8err;
-		ret = d2i_PrivateKey(ameth->pkey_id, x,&p, len);
+		ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
 	}
 
 p8err:
@@ -159,7 +159,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
 	(void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY",
 	    x->ameth->pem_str);
 	return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
-	    pem_str, bp, x,enc, kstr, klen, cb, u);
+	    pem_str, bp, x, enc, kstr, klen, cb, u);
 }
 
 EVP_PKEY *
@@ -214,7 +214,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
 	(void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS",
 	    x->ameth->pem_str);
 	return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
-	    pem_str, bp, x,NULL, NULL, 0,0, NULL);
+	    pem_str, bp, x, NULL, NULL, 0, 0, NULL);
 }
 
 #ifndef OPENSSL_NO_FP_API
@@ -229,7 +229,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 		return (0);
 	}
 	BIO_set_fp(b, fp, BIO_NOCLOSE);
-	ret = PEM_read_bio_PrivateKey(b, x,cb, u);
+	ret = PEM_read_bio_PrivateKey(b, x, cb, u);
 	BIO_free(b);
 	return (ret);
 }
diff --git a/lib/libcrypto/pem/pem_seal.c b/lib/libcrypto/pem/pem_seal.c
index e39de08c9a1..3c0be6d305a 100644
--- a/lib/libcrypto/pem/pem_seal.c
+++ b/lib/libcrypto/pem/pem_seal.c
@@ -173,7 +173,7 @@ PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
 	EVP_EncodeFinal(&ctx->encode, out, &j);
 	*outl += j;
 
-	if (!EVP_SignFinal(&ctx->md, s,&i, priv))
+	if (!EVP_SignFinal(&ctx->md, s, &i, priv))
 		goto err;
 	*sigl = EVP_EncodeBlock(sig, s, i);
 
diff --git a/lib/libcrypto/pem/pem_sign.c b/lib/libcrypto/pem/pem_sign.c
index ab3e5ebc64f..8a6bcc8d8df 100644
--- a/lib/libcrypto/pem/pem_sign.c
+++ b/lib/libcrypto/pem/pem_sign.c
@@ -91,7 +91,7 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 		goto err;
 	}
 
-	if (EVP_SignFinal(ctx, m,&m_len, pkey) <= 0)
+	if (EVP_SignFinal(ctx, m, &m_len, pkey) <= 0)
 		goto err;
 
 	i = EVP_EncodeBlock(sigret, m, m_len);
diff --git a/lib/libssl/src/crypto/pem/pem_lib.c b/lib/libssl/src/crypto/pem/pem_lib.c
index 9d5d8e714ca..c670ac2acb8 100644
--- a/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/lib/libssl/src/crypto/pem/pem_lib.c
@@ -501,10 +501,10 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
 	}
 	header += 11;
 	if (*header != '4')
-		return(0);
+		return (0);
 	header++;
 	if (*header != ',')
-		return(0);
+		return (0);
 	header++;
 	if (strncmp(header, "ENCRYPTED", 9) != 0) {
 		PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_ENCRYPTED);
diff --git a/lib/libssl/src/crypto/pem/pem_pkey.c b/lib/libssl/src/crypto/pem/pem_pkey.c
index 9aaff6e5148..bcce39281e0 100644
--- a/lib/libssl/src/crypto/pem/pem_pkey.c
+++ b/lib/libssl/src/crypto/pem/pem_pkey.c
@@ -133,7 +133,7 @@ PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 		ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
 		if (!ameth || !ameth->old_priv_decode)
 			goto p8err;
-		ret = d2i_PrivateKey(ameth->pkey_id, x,&p, len);
+		ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
 	}
 
 p8err:
@@ -159,7 +159,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
 	(void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY",
 	    x->ameth->pem_str);
 	return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
-	    pem_str, bp, x,enc, kstr, klen, cb, u);
+	    pem_str, bp, x, enc, kstr, klen, cb, u);
 }
 
 EVP_PKEY *
@@ -214,7 +214,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
 	(void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS",
 	    x->ameth->pem_str);
 	return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
-	    pem_str, bp, x,NULL, NULL, 0,0, NULL);
+	    pem_str, bp, x, NULL, NULL, 0, 0, NULL);
 }
 
 #ifndef OPENSSL_NO_FP_API
@@ -229,7 +229,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 		return (0);
 	}
 	BIO_set_fp(b, fp, BIO_NOCLOSE);
-	ret = PEM_read_bio_PrivateKey(b, x,cb, u);
+	ret = PEM_read_bio_PrivateKey(b, x, cb, u);
 	BIO_free(b);
 	return (ret);
 }
diff --git a/lib/libssl/src/crypto/pem/pem_seal.c b/lib/libssl/src/crypto/pem/pem_seal.c
index e39de08c9a1..3c0be6d305a 100644
--- a/lib/libssl/src/crypto/pem/pem_seal.c
+++ b/lib/libssl/src/crypto/pem/pem_seal.c
@@ -173,7 +173,7 @@ PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
 	EVP_EncodeFinal(&ctx->encode, out, &j);
 	*outl += j;
 
-	if (!EVP_SignFinal(&ctx->md, s,&i, priv))
+	if (!EVP_SignFinal(&ctx->md, s, &i, priv))
 		goto err;
 	*sigl = EVP_EncodeBlock(sig, s, i);
 
diff --git a/lib/libssl/src/crypto/pem/pem_sign.c b/lib/libssl/src/crypto/pem/pem_sign.c
index ab3e5ebc64f..8a6bcc8d8df 100644
--- a/lib/libssl/src/crypto/pem/pem_sign.c
+++ b/lib/libssl/src/crypto/pem/pem_sign.c
@@ -91,7 +91,7 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 		goto err;
 	}
 
-	if (EVP_SignFinal(ctx, m,&m_len, pkey) <= 0)
+	if (EVP_SignFinal(ctx, m, &m_len, pkey) <= 0)
 		goto err;
 
 	i = EVP_EncodeBlock(sigret, m, m_len);