More KNF.

1 files changed, 80 insertions, 76 deletions

diff --git a/lib/libcrypto/asn1/ameth_lib.c b/lib/libcrypto/asn1/ameth_lib.c
index bbaf6b4dfbd..63ff18edae4 100644
--- a/lib/libcrypto/asn1/ameth_lib.c
+++ b/lib/libcrypto/asn1/ameth_lib.c
@@ -9,7 +9,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -72,8 +72,7 @@ extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth;
 
 /* Keep this sorted in type order !! */
-static const EVP_PKEY_ASN1_METHOD *standard_methods[] = 
-{
+static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
 #ifndef OPENSSL_NO_RSA
 	&rsa_asn1_meths[0],
 	&rsa_asn1_meths[1],
@@ -99,53 +98,55 @@ typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
 DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)
 static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
 
-
-
 #ifdef TEST
-void main()
+void
+main()
 {
 	int i;
 	for (i = 0;
-		i < sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
-		i++)
+	    i < sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *); i++)
 		fprintf(stderr, "Number %d id=%d (%s)\n", i,
-			standard_methods[i]->pkey_id,
-			OBJ_nid2sn(standard_methods[i]->pkey_id));
+		    standard_methods[i]->pkey_id,
+		    OBJ_nid2sn(standard_methods[i]->pkey_id));
 }
 #endif
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
-			   const EVP_PKEY_ASN1_METHOD *, ameth);
+    const EVP_PKEY_ASN1_METHOD *, ameth);
 
-static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
-		     const EVP_PKEY_ASN1_METHOD * const *b)
+static int
+ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
+    const EVP_PKEY_ASN1_METHOD * const *b)
 {
-        return ((*a)->pkey_id - (*b)->pkey_id);
+	return ((*a)->pkey_id - (*b)->pkey_id);
 }
 
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
-			     const EVP_PKEY_ASN1_METHOD *, ameth);
+    const EVP_PKEY_ASN1_METHOD *, ameth);
 
-int EVP_PKEY_asn1_get_count(void)
+int
+EVP_PKEY_asn1_get_count(void)
 {
-	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+	int num = sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *);
 	if (app_methods)
 		num += sk_EVP_PKEY_ASN1_METHOD_num(app_methods);
 	return num;
 }
 
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)
+const EVP_PKEY_ASN1_METHOD *
+EVP_PKEY_asn1_get0(int idx)
 {
-	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+	int num = sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *);
 	if (idx < 0)
-		return NULL; 
+		return NULL;
 	if (idx < num)
 		return standard_methods[idx];
 	idx -= num;
 	return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
 }
 
-static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
+static const EVP_PKEY_ASN1_METHOD *
+pkey_asn1_find(int type)
 {
 	EVP_PKEY_ASN1_METHOD tmp;
 	const EVP_PKEY_ASN1_METHOD *t = &tmp, **ret;
@@ -157,8 +158,7 @@ static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
 			return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
 	}
 	ret = OBJ_bsearch_ameth(&t, standard_methods,
-			  sizeof(standard_methods)
-			  /sizeof(EVP_PKEY_ASN1_METHOD *));
+	    sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *));
 	if (!ret || !*ret)
 		return NULL;
 	return *ret;
@@ -166,11 +166,12 @@ static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
 
 /* Find an implementation of an ASN1 algorithm. If 'pe' is not NULL
  * also search through engines and set *pe to a functional reference
- * to the engine implementing 'type' or NULL if no engine implements 
+ * to the engine implementing 'type' or NULL if no engine implements
  * it.
  */
 
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
+const EVP_PKEY_ASN1_METHOD *
+EVP_PKEY_asn1_find(ENGINE **pe, int type)
 {
 	const EVP_PKEY_ASN1_METHOD *t;
 
@@ -195,8 +196,8 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
 	return t;
 }
 
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-					const char *str, int len)
+const EVP_PKEY_ASN1_METHOD *
+EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len)
 {
 	int i;
 	const EVP_PKEY_ASN1_METHOD *ameth;
@@ -223,14 +224,15 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
 		ameth = EVP_PKEY_asn1_get0(i);
 		if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
 			continue;
-		if (((int)strlen(ameth->pem_str) == len) && 
-			!strncasecmp(ameth->pem_str, str, len))
+		if (((int)strlen(ameth->pem_str) == len) &&
+		    !strncasecmp(ameth->pem_str, str, len))
 			return ameth;
 	}
 	return NULL;
 }
 
-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
+int
+EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
 {
 	if (app_methods == NULL) {
 		app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);
@@ -243,7 +245,8 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
 	return 1;
 }
 
-int EVP_PKEY_asn1_add_alias(int to, int from)
+int
+EVP_PKEY_asn1_add_alias(int to, int from)
 {
 	EVP_PKEY_ASN1_METHOD *ameth;
 	ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL, NULL);
@@ -253,9 +256,10 @@ int EVP_PKEY_asn1_add_alias(int to, int from)
 	return EVP_PKEY_asn1_add0(ameth);
 }
 
-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
-				const char **pinfo, const char **ppem_str,
-					const EVP_PKEY_ASN1_METHOD *ameth)
+int
+EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
+    const char **pinfo, const char **ppem_str,
+    const EVP_PKEY_ASN1_METHOD *ameth)
 {
 	if (!ameth)
 		return 0;
@@ -272,15 +276,17 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
 	return 1;
 }
 
-const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(EVP_PKEY *pkey)
+const EVP_PKEY_ASN1_METHOD*
+EVP_PKEY_get0_asn1(EVP_PKEY *pkey)
 {
 	return pkey->ameth;
 }
 
-EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
-					const char *pem_str, const char *info)
+EVP_PKEY_ASN1_METHOD*
+EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info)
 {
 	EVP_PKEY_ASN1_METHOD *ameth;
+
 	ameth = malloc(sizeof(EVP_PKEY_ASN1_METHOD));
 	if (!ameth)
 		return NULL;
@@ -295,16 +301,14 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
 		ameth->info = BUF_strdup(info);
 		if (!ameth->info)
 			goto err;
-	}
-	else
+	} else
 		ameth->info = NULL;
 
 	if (pem_str) {
 		ameth->pem_str = BUF_strdup(pem_str);
 		if (!ameth->pem_str)
 			goto err;
-	}
-	else
+	} else
 		ameth->pem_str = NULL;
 
 	ameth->pub_decode = 0;
@@ -337,17 +341,14 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
 
 	return ameth;
 
-	err:
-
+err:
 	EVP_PKEY_asn1_free(ameth);
 	return NULL;
-
 }
 
-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 
-			const EVP_PKEY_ASN1_METHOD *src)
+void
+EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src)
 {
-
 	dst->pub_decode = src->pub_decode;
 	dst->pub_encode = src->pub_encode;
 	dst->pub_cmp = src->pub_cmp;
@@ -375,10 +376,10 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
 
 	dst->item_sign = src->item_sign;
 	dst->item_verify = src->item_verify;
-
 }
 
-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
+void
+EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
 {
 	if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC)) {
 		if (ameth->pem_str)
@@ -389,14 +390,15 @@ void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
 	}
 }
 
-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),
-		int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),
-		int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
-		int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx),
-		int (*pkey_size)(const EVP_PKEY *pk),
-		int (*pkey_bits)(const EVP_PKEY *pk))
+void
+EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
+    int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),
+    int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),
+    int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
+    int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+	ASN1_PCTX *pctx),
+    int (*pkey_size)(const EVP_PKEY *pk),
+    int (*pkey_bits)(const EVP_PKEY *pk))
 {
 	ameth->pub_decode = pub_decode;
 	ameth->pub_encode = pub_encode;
@@ -406,26 +408,27 @@ void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
 	ameth->pkey_bits = pkey_bits;
 }
 
-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),
-		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),
-		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx))
+void
+EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
+    int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),
+    int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),
+    int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+	ASN1_PCTX *pctx))
 {
 	ameth->priv_decode = priv_decode;
 	ameth->priv_encode = priv_encode;
 	ameth->priv_print = priv_print;
 }
 
-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*param_decode)(EVP_PKEY *pkey,
-				const unsigned char **pder, int derlen),
-		int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),
-		int (*param_missing)(const EVP_PKEY *pk),
-		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
-		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
-		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx))
+void
+EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
+    int (*param_decode)(EVP_PKEY *pkey, const unsigned char **pder, int derlen),
+    int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),
+    int (*param_missing)(const EVP_PKEY *pk),
+    int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
+    int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
+    int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+	ASN1_PCTX *pctx))
 {
 	ameth->param_decode = param_decode;
 	ameth->param_encode = param_encode;
@@ -435,15 +438,16 @@ void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
 	ameth->param_print = param_print;
 }
 
-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-		void (*pkey_free)(EVP_PKEY *pkey))
+void
+EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
+    void (*pkey_free)(EVP_PKEY *pkey))
 {
 	ameth->pkey_free = pkey_free;
 }
 
-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*pkey_ctrl)(EVP_PKEY *pkey, int op,
-							long arg1, void *arg2))
+void
+EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
+    int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2))
 {
 	ameth->pkey_ctrl = pkey_ctrl;
 }