KNF.

5 files changed, 305 insertions, 238 deletions

diff --git a/lib/libcrypto/x509/x509cset.c b/lib/libcrypto/x509/x509cset.c
index bb39cf4e04e..ee405d6e9f2 100644
--- a/lib/libcrypto/x509/x509cset.c
+++ b/lib/libcrypto/x509/x509cset.c
@@ -10,7 +10,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
@@ -63,98 +63,111 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-int X509_CRL_set_version(X509_CRL *x, long version)
+int
+X509_CRL_set_version(X509_CRL *x, long version)
 {
-	if (x == NULL) return(0);
+	if (x == NULL)
+		return (0);
 	if (x->crl->version == NULL) {
-		if ((x->crl->version=M_ASN1_INTEGER_new()) == NULL)
-			return(0);
+		if ((x->crl->version = M_ASN1_INTEGER_new()) == NULL)
+			return (0);
 	}
-	return(ASN1_INTEGER_set(x->crl->version,version));
+	return (ASN1_INTEGER_set(x->crl->version, version));
 }
 
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
+int
+X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
 {
-	if ((x == NULL) || (x->crl == NULL)) return(0);
-	return(X509_NAME_set(&x->crl->issuer,name));
+	if ((x == NULL) || (x->crl == NULL))
+		return (0);
+	return (X509_NAME_set(&x->crl->issuer, name));
 }
 
-
-int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
+int
+X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
 {
 	ASN1_TIME *in;
 
-	if (x == NULL) return(0);
-	in=x->crl->lastUpdate;
+	if (x == NULL)
+		return (0);
+	in = x->crl->lastUpdate;
 	if (in != tm) {
-		in=M_ASN1_TIME_dup(tm);
+		in = M_ASN1_TIME_dup(tm);
 		if (in != NULL) {
 			M_ASN1_TIME_free(x->crl->lastUpdate);
-			x->crl->lastUpdate=in;
+			x->crl->lastUpdate = in;
 		}
 	}
-	return(in != NULL);
+	return (in != NULL);
 }
 
-int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
+int
+X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
 {
 	ASN1_TIME *in;
 
-	if (x == NULL) return(0);
-	in=x->crl->nextUpdate;
+	if (x == NULL)
+		return (0);
+	in = x->crl->nextUpdate;
 	if (in != tm) {
-		in=M_ASN1_TIME_dup(tm);
+		in = M_ASN1_TIME_dup(tm);
 		if (in != NULL) {
 			M_ASN1_TIME_free(x->crl->nextUpdate);
-			x->crl->nextUpdate=in;
+			x->crl->nextUpdate = in;
 		}
 	}
-	return(in != NULL);
+	return (in != NULL);
 }
 
-int X509_CRL_sort(X509_CRL *c)
+int
+X509_CRL_sort(X509_CRL *c)
 {
 	int i;
 	X509_REVOKED *r;
+
 	/* sort the data so it will be written in serial
 	 * number order */
 	sk_X509_REVOKED_sort(c->crl->revoked);
-	for (i=0; i<sk_X509_REVOKED_num(c->crl->revoked); i++) {
-		r=sk_X509_REVOKED_value(c->crl->revoked,i);
-		r->sequence=i;
+	for (i = 0; i < sk_X509_REVOKED_num(c->crl->revoked); i++) {
+		r = sk_X509_REVOKED_value(c->crl->revoked, i);
+		r->sequence = i;
 	}
 	c->crl->enc.modified = 1;
 	return 1;
 }
 
-int X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
+int
+X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
 {
 	ASN1_TIME *in;
 
-	if (x == NULL) return(0);
-	in=x->revocationDate;
+	if (x == NULL)
+		return (0);
+	in = x->revocationDate;
 	if (in != tm) {
-		in=M_ASN1_TIME_dup(tm);
+		in = M_ASN1_TIME_dup(tm);
 		if (in != NULL) {
 			M_ASN1_TIME_free(x->revocationDate);
-			x->revocationDate=in;
+			x->revocationDate = in;
 		}
 	}
-	return(in != NULL);
+	return (in != NULL);
 }
 
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
+int
+X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
 {
 	ASN1_INTEGER *in;
 
-	if (x == NULL) return(0);
-	in=x->serialNumber;
+	if (x == NULL)
+		return (0);
+	in = x->serialNumber;
 	if (in != serial) {
-		in=M_ASN1_INTEGER_dup(serial);
+		in = M_ASN1_INTEGER_dup(serial);
 		if (in != NULL) {
 			M_ASN1_INTEGER_free(x->serialNumber);
-			x->serialNumber=in;
+			x->serialNumber = in;
 		}
 	}
-	return(in != NULL);
+	return (in != NULL);
 }
diff --git a/lib/libcrypto/x509/x509name.c b/lib/libcrypto/x509/x509name.c
index 729fb060f8d..3d90fd67fee 100644
--- a/lib/libcrypto/x509/x509name.c
+++ b/lib/libcrypto/x509/x509name.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,97 +64,110 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
+int
+X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
 {
 	ASN1_OBJECT *obj;
 
-	obj=OBJ_nid2obj(nid);
-	if (obj == NULL) return(-1);
-	return(X509_NAME_get_text_by_OBJ(name,obj,buf,len));
+	obj = OBJ_nid2obj(nid);
+	if (obj == NULL)
+		return (-1);
+	return (X509_NAME_get_text_by_OBJ(name, obj, buf, len));
 }
 
-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
-	     int len)
+int
+X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
+    int len)
 {
 	int i;
 	ASN1_STRING *data;
 
-	i=X509_NAME_get_index_by_OBJ(name,obj,-1);
-	if (i < 0) return(-1);
-	data=X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name,i));
-	i=(data->length > (len-1))?(len-1):data->length;
-	if (buf == NULL) return(data->length);
-	memcpy(buf,data->data,i);
-	buf[i]='\0';
-	return(i);
+	i = X509_NAME_get_index_by_OBJ(name, obj, -1);
+	if (i < 0)
+		return (-1);
+	data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
+	i = (data->length > (len - 1)) ? (len - 1) : data->length;
+	if (buf == NULL)
+		return (data->length);
+	memcpy(buf, data->data, i);
+	buf[i] = '\0';
+	return (i);
 }
 
-int X509_NAME_entry_count(X509_NAME *name)
+int
+X509_NAME_entry_count(X509_NAME *name)
 {
-	if (name == NULL) return(0);
-	return(sk_X509_NAME_ENTRY_num(name->entries));
+	if (name == NULL)
+		return (0);
+	return (sk_X509_NAME_ENTRY_num(name->entries));
 }
 
-int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
+int
+X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
 {
 	ASN1_OBJECT *obj;
 
-	obj=OBJ_nid2obj(nid);
-	if (obj == NULL) return(-2);
-	return(X509_NAME_get_index_by_OBJ(name,obj,lastpos));
+	obj = OBJ_nid2obj(nid);
+	if (obj == NULL)
+		return (-2);
+	return (X509_NAME_get_index_by_OBJ(name, obj, lastpos));
 }
 
 /* NOTE: you should be passsing -1, not 0 as lastpos */
-int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-	     int lastpos)
+int
+X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos)
 {
 	int n;
 	X509_NAME_ENTRY *ne;
 	STACK_OF(X509_NAME_ENTRY) *sk;
 
-	if (name == NULL) return(-1);
+	if (name == NULL)
+		return (-1);
 	if (lastpos < 0)
-		lastpos= -1;
-	sk=name->entries;
-	n=sk_X509_NAME_ENTRY_num(sk);
+		lastpos = -1;
+	sk = name->entries;
+	n = sk_X509_NAME_ENTRY_num(sk);
 	for (lastpos++; lastpos < n; lastpos++) {
-		ne=sk_X509_NAME_ENTRY_value(sk,lastpos);
-		if (OBJ_cmp(ne->object,obj) == 0)
-			return(lastpos);
+		ne = sk_X509_NAME_ENTRY_value(sk, lastpos);
+		if (OBJ_cmp(ne->object, obj) == 0)
+			return (lastpos);
 	}
-	return(-1);
+	return (-1);
 }
 
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc)
+X509_NAME_ENTRY *
+X509_NAME_get_entry(X509_NAME *name, int loc)
 {
-	if(name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
-	   || loc < 0)
-		return(NULL);
+	if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc ||
+	    loc < 0)
+		return (NULL);
 	else
-		return(sk_X509_NAME_ENTRY_value(name->entries,loc));
+		return (sk_X509_NAME_ENTRY_value(name->entries, loc));
 }
 
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
+X509_NAME_ENTRY *
+X509_NAME_delete_entry(X509_NAME *name, int loc)
 {
 	X509_NAME_ENTRY *ret;
-	int i,n,set_prev,set_next;
+	int i, n, set_prev, set_next;
 	STACK_OF(X509_NAME_ENTRY) *sk;
 
-	if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
-	    || loc < 0)
-		return(NULL);
-	sk=name->entries;
-	ret=sk_X509_NAME_ENTRY_delete(sk,loc);
-	n=sk_X509_NAME_ENTRY_num(sk);
-	name->modified=1;
-	if (loc == n) return(ret);
+	if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc ||
+	    loc < 0)
+		return (NULL);
+	sk = name->entries;
+	ret = sk_X509_NAME_ENTRY_delete(sk, loc);
+	n = sk_X509_NAME_ENTRY_num(sk);
+	name->modified = 1;
+	if (loc == n)
+		return (ret);
 
 	/* else we need to fixup the set field */
 	if (loc != 0)
-		set_prev=(sk_X509_NAME_ENTRY_value(sk,loc-1))->set;
+		set_prev = (sk_X509_NAME_ENTRY_value(sk, loc - 1))->set;
 	else
-		set_prev=ret->set-1;
-	set_next=sk_X509_NAME_ENTRY_value(sk,loc)->set;
+		set_prev = ret->set - 1;
+	set_next = sk_X509_NAME_ENTRY_value(sk, loc)->set;
 
 	/* set_prev is the previous set
 	 * set is the current set
@@ -164,43 +177,52 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
 	 * next  1 1	2 2	2 2	3 2
 	 * so basically only if prev and next differ by 2, then
 	 * re-number down by 1 */
-	if (set_prev+1 < set_next)
-		for (i=loc; i<n; i++)
-			sk_X509_NAME_ENTRY_value(sk,i)->set--;
-	return(ret);
+	if (set_prev + 1 < set_next)
+		for (i = loc; i < n; i++)
+			sk_X509_NAME_ENTRY_value(sk, i)->set--;
+	return (ret);
 }
 
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-			unsigned char *bytes, int len, int loc, int set)
+int
+X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
+    unsigned char *bytes, int len, int loc, int set)
 {
 	X509_NAME_ENTRY *ne;
 	int ret;
+
 	ne = X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);
-	if(!ne) return 0;
+	if (!ne)
+		return 0;
 	ret = X509_NAME_add_entry(name, ne, loc, set);
 	X509_NAME_ENTRY_free(ne);
 	return ret;
 }
 
-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-			unsigned char *bytes, int len, int loc, int set)
+int
+X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
+    unsigned char *bytes, int len, int loc, int set)
 {
 	X509_NAME_ENTRY *ne;
 	int ret;
+
 	ne = X509_NAME_ENTRY_create_by_NID(NULL, nid, type, bytes, len);
-	if(!ne) return 0;
+	if (!ne)
+		return 0;
 	ret = X509_NAME_add_entry(name, ne, loc, set);
 	X509_NAME_ENTRY_free(ne);
 	return ret;
 }
 
-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-			const unsigned char *bytes, int len, int loc, int set)
+int
+X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
+    const unsigned char *bytes, int len, int loc, int set)
 {
 	X509_NAME_ENTRY *ne;
 	int ret;
+
 	ne = X509_NAME_ENTRY_create_by_txt(NULL, field, type, bytes, len);
-	if(!ne) return 0;
+	if (!ne)
+		return 0;
 	ret = X509_NAME_add_entry(name, ne, loc, set);
 	X509_NAME_ENTRY_free(ne);
 	return ret;
@@ -208,159 +230,177 @@ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
 
 /* if set is -1, append to previous set, 0 'a new one', and 1,
  * prepend to the guy we are about to stomp on. */
-int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
-	     int set)
+int
+X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc, int set)
 {
-	X509_NAME_ENTRY *new_name=NULL;
-	int n,i,inc;
+	X509_NAME_ENTRY *new_name = NULL;
+	int n, i, inc;
 	STACK_OF(X509_NAME_ENTRY) *sk;
 
-	if (name == NULL) return(0);
-	sk=name->entries;
-	n=sk_X509_NAME_ENTRY_num(sk);
-	if (loc > n) loc=n;
-	else if (loc < 0) loc=n;
+	if (name == NULL)
+		return (0);
+	sk = name->entries;
+	n = sk_X509_NAME_ENTRY_num(sk);
+	if (loc > n)
+		loc = n;
+	else if (loc < 0)
+		loc = n;
 
-	name->modified=1;
+	name->modified = 1;
 
 	if (set == -1) {
 		if (loc == 0) {
-			set=0;
-			inc=1;
+			set = 0;
+			inc = 1;
 		} else {
-			set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set;
-			inc=0;
+			set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
+			inc = 0;
 		}
 	} else /* if (set >= 0) */ {
 		if (loc >= n) {
 			if (loc != 0)
-				set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set+1;
+				set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set + 1;
 			else
-				set=0;
+				set = 0;
 		} else
-			set=sk_X509_NAME_ENTRY_value(sk,loc)->set;
-		inc=(set == 0)?1:0;
+			set = sk_X509_NAME_ENTRY_value(sk, loc)->set;
+		inc = (set == 0) ? 1 : 0;
 	}
 
-	if ((new_name=X509_NAME_ENTRY_dup(ne)) == NULL)
+	if ((new_name = X509_NAME_ENTRY_dup(ne)) == NULL)
 		goto err;
-	new_name->set=set;
-	if (!sk_X509_NAME_ENTRY_insert(sk,new_name,loc)) {
-		X509err(X509_F_X509_NAME_ADD_ENTRY,ERR_R_MALLOC_FAILURE);
+	new_name->set = set;
+	if (!sk_X509_NAME_ENTRY_insert(sk, new_name, loc)) {
+		X509err(X509_F_X509_NAME_ADD_ENTRY, ERR_R_MALLOC_FAILURE);
 		goto err;
 	}
 	if (inc) {
-		n=sk_X509_NAME_ENTRY_num(sk);
-		for (i=loc+1; i<n; i++)
-			sk_X509_NAME_ENTRY_value(sk,i-1)->set+=1;
-	}	
-	return(1);
+		n = sk_X509_NAME_ENTRY_num(sk);
+		for (i = loc + 1; i < n; i++)
+			sk_X509_NAME_ENTRY_value(sk, i - 1)->set += 1;
+	}
+	return (1);
+
 err:
 	if (new_name != NULL)
 		X509_NAME_ENTRY_free(new_name);
-	return(0);
+	return (0);
 }
 
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-		const char *field, int type, const unsigned char *bytes, int len)
+X509_NAME_ENTRY *
+X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
+    const char *field, int type, const unsigned char *bytes, int len)
 {
 	ASN1_OBJECT *obj;
 	X509_NAME_ENTRY *nentry;
 
-	obj=OBJ_txt2obj(field, 0);
+	obj = OBJ_txt2obj(field, 0);
 	if (obj == NULL) {
 		X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
-						X509_R_INVALID_FIELD_NAME);
+		    X509_R_INVALID_FIELD_NAME);
 		ERR_add_error_data(2, "name=", field);
-		return(NULL);
+		return (NULL);
 	}
-	nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
+	nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
 	ASN1_OBJECT_free(obj);
 	return nentry;
 }
 
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-	     int type, unsigned char *bytes, int len)
+X509_NAME_ENTRY *
+X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,
+    unsigned char *bytes, int len)
 {
 	ASN1_OBJECT *obj;
 	X509_NAME_ENTRY *nentry;
 
-	obj=OBJ_nid2obj(nid);
+	obj = OBJ_nid2obj(nid);
 	if (obj == NULL) {
-		X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID,X509_R_UNKNOWN_NID);
-		return(NULL);
+		X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID,
+		    X509_R_UNKNOWN_NID);
+		return (NULL);
 	}
-	nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
+	nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
 	ASN1_OBJECT_free(obj);
 	return nentry;
 }
 
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-	     ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len)
+X509_NAME_ENTRY *
+X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type,
+    const unsigned char *bytes, int len)
 {
 	X509_NAME_ENTRY *ret;
 
 	if ((ne == NULL) || (*ne == NULL)) {
-		if ((ret=X509_NAME_ENTRY_new()) == NULL)
-			return(NULL);
+		if ((ret = X509_NAME_ENTRY_new()) == NULL)
+			return (NULL);
 	} else
 		ret= *ne;
 
-	if (!X509_NAME_ENTRY_set_object(ret,obj))
+	if (!X509_NAME_ENTRY_set_object(ret, obj))
 		goto err;
-	if (!X509_NAME_ENTRY_set_data(ret,type,bytes,len))
+	if (!X509_NAME_ENTRY_set_data(ret, type, bytes, len))
 		goto err;
 
-	if ((ne != NULL) && (*ne == NULL)) *ne=ret;
-	return(ret);
+	if ((ne != NULL) && (*ne == NULL))
+		*ne = ret;
+	return (ret);
+
 err:
 	if ((ne == NULL) || (ret != *ne))
 		X509_NAME_ENTRY_free(ret);
-	return(NULL);
+	return (NULL);
 }
 
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj)
+int
+X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj)
 {
 	if ((ne == NULL) || (obj == NULL)) {
-		X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,ERR_R_PASSED_NULL_PARAMETER);
-		return(0);
+		X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,
+		    ERR_R_PASSED_NULL_PARAMETER);
+		return (0);
 	}
 	ASN1_OBJECT_free(ne->object);
-	ne->object=OBJ_dup(obj);
-	return((ne->object == NULL)?0:1);
+	ne->object = OBJ_dup(obj);
+	return ((ne->object == NULL) ? 0 : 1);
 }
 
-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-	     const unsigned char *bytes, int len)
+int
+X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
+    const unsigned char *bytes, int len)
 {
 	int i;
 
-	if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);
-	if((type > 0) && (type & MBSTRING_FLAG)) 
-		return ASN1_STRING_set_by_NID(&ne->value, bytes,
-						len, type,
-					OBJ_obj2nid(ne->object)) ? 1 : 0;
-	if (len < 0) len=strlen((const char *)bytes);
-	i=ASN1_STRING_set(ne->value,bytes,len);
-	if (!i) return(0);
+	if ((ne == NULL) || ((bytes == NULL) && (len != 0)))
+		return (0);
+	if ((type > 0) && (type & MBSTRING_FLAG))
+		return ASN1_STRING_set_by_NID(&ne->value, bytes, len, type,
+		    OBJ_obj2nid(ne->object)) ? 1 : 0;
+	if (len < 0)
+		len = strlen((const char *)bytes);
+	i = ASN1_STRING_set(ne->value, bytes, len);
+	if (!i)
+		return (0);
 	if (type != V_ASN1_UNDEF) {
 		if (type == V_ASN1_APP_CHOOSE)
-			ne->value->type=ASN1_PRINTABLE_type(bytes,len);
+			ne->value->type = ASN1_PRINTABLE_type(bytes, len);
 		else
-			ne->value->type=type;
+			ne->value->type = type;
 	}
-	return(1);
+	return (1);
 }
 
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne)
+ASN1_OBJECT *
+X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne)
 {
-	if (ne == NULL) return(NULL);
-	return(ne->object);
+	if (ne == NULL)
+		return (NULL);
+	return (ne->object);
 }
 
-ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne)
+ASN1_STRING *
+X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne)
 {
-	if (ne == NULL) return(NULL);
-	return(ne->value);
+	if (ne == NULL)
+		return (NULL);
+	return (ne->value);
 }
-
diff --git a/lib/libcrypto/x509/x509rset.c b/lib/libcrypto/x509/x509rset.c
index fab93cce973..791b7916b8c 100644
--- a/lib/libcrypto/x509/x509rset.c
+++ b/lib/libcrypto/x509/x509rset.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
@@ -63,21 +63,26 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-int X509_REQ_set_version(X509_REQ *x, long version)
+int
+X509_REQ_set_version(X509_REQ *x, long version)
 {
-	if (x == NULL) return(0);
-	return(ASN1_INTEGER_set(x->req_info->version,version));
+	if (x == NULL)
+		return (0);
+	return (ASN1_INTEGER_set(x->req_info->version, version));
 }
 
-int X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name)
+int
+X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name)
 {
-	if ((x == NULL) || (x->req_info == NULL)) return(0);
-	return(X509_NAME_set(&x->req_info->subject,name));
+	if ((x == NULL) || (x->req_info == NULL))
+		return (0);
+	return (X509_NAME_set(&x->req_info->subject, name));
 }
 
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
+int
+X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
 {
-	if ((x == NULL) || (x->req_info == NULL)) return(0);
-	return(X509_PUBKEY_set(&x->req_info->pubkey,pkey));
+	if ((x == NULL) || (x->req_info == NULL))
+		return (0);
+	return (X509_PUBKEY_set(&x->req_info->pubkey, pkey));
 }
-
diff --git a/lib/libcrypto/x509/x509spki.c b/lib/libcrypto/x509/x509spki.c
index 9f0fbd39e3e..b5f67b5a97c 100644
--- a/lib/libcrypto/x509/x509spki.c
+++ b/lib/libcrypto/x509/x509spki.c
@@ -10,7 +10,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
@@ -60,36 +60,42 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
+int
+NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
 {
-	if ((x == NULL) || (x->spkac == NULL)) return(0);
-	return(X509_PUBKEY_set(&(x->spkac->pubkey),pkey));
+	if ((x == NULL) || (x->spkac == NULL))
+		return (0);
+	return (X509_PUBKEY_set(&(x->spkac->pubkey), pkey));
 }
 
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
+EVP_PKEY *
+NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
 {
 	if ((x == NULL) || (x->spkac == NULL))
-		return(NULL);
-	return(X509_PUBKEY_get(x->spkac->pubkey));
+		return (NULL);
+	return (X509_PUBKEY_get(x->spkac->pubkey));
 }
 
 /* Load a Netscape SPKI from a base64 encoded string */
 
-NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len)
+NETSCAPE_SPKI *
+NETSCAPE_SPKI_b64_decode(const char *str, int len)
 {
 	unsigned char *spki_der;
 	const unsigned char *p;
 	int spki_len;
 	NETSCAPE_SPKI *spki;
-	if(len <= 0) len = strlen(str);
+
+	if (len <= 0)
+		len = strlen(str);
 	if (!(spki_der = malloc(len + 1))) {
 		X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE);
 		return NULL;
 	}
 	spki_len = EVP_DecodeBlock(spki_der, (const unsigned char *)str, len);
-	if(spki_len < 0) {
+	if (spki_len < 0) {
 		X509err(X509_F_NETSCAPE_SPKI_B64_DECODE,
-						X509_R_BASE64_DECODE_ERROR);
+		    X509_R_BASE64_DECODE_ERROR);
 		free(spki_der);
 		return NULL;
 	}
@@ -101,7 +107,8 @@ NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len)
 
 /* Generate a base64 encoded string from an SPKI */
 
-char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
+char *
+NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
 {
 	unsigned char *der_spki, *p;
 	char *b64_str;
@@ -109,7 +116,7 @@ char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
 	der_len = i2d_NETSCAPE_SPKI(spki, NULL);
 	der_spki = malloc(der_len);
 	b64_str = malloc(der_len * 2);
-	if(!der_spki || !b64_str) {
+	if (!der_spki || !b64_str) {
 		X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
 		free(der_spki);
 		free(b64_str);
diff --git a/lib/libcrypto/x509/x509type.c b/lib/libcrypto/x509/x509type.c
index ff06cfcab99..b85363f37ef 100644
--- a/lib/libcrypto/x509/x509type.c
+++ b/lib/libcrypto/x509/x509type.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
@@ -62,57 +62,59 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
+int
+X509_certificate_type(X509 *x, EVP_PKEY *pkey)
 {
 	EVP_PKEY *pk;
-	int ret=0,i;
+	int ret = 0, i;
 
-	if (x == NULL) return(0);
+	if (x == NULL)
+		return (0);
 
 	if (pkey == NULL)
-		pk=X509_get_pubkey(x);
+		pk = X509_get_pubkey(x);
 	else
-		pk=pkey;
+		pk = pkey;
 
-	if (pk == NULL) return(0);
+	if (pk == NULL)
+		return (0);
 
 	switch (pk->type) {
 	case EVP_PKEY_RSA:
-		ret=EVP_PK_RSA|EVP_PKT_SIGN;
+		ret = EVP_PK_RSA|EVP_PKT_SIGN;
 /*		if (!sign only extension) */
-			ret|=EVP_PKT_ENC;
-	break;
+		ret |= EVP_PKT_ENC;
+		break;
 	case EVP_PKEY_DSA:
-		ret=EVP_PK_DSA|EVP_PKT_SIGN;
+		ret = EVP_PK_DSA|EVP_PKT_SIGN;
 		break;
 	case EVP_PKEY_EC:
-		ret=EVP_PK_EC|EVP_PKT_SIGN|EVP_PKT_EXCH;
+		ret = EVP_PK_EC|EVP_PKT_SIGN|EVP_PKT_EXCH;
 		break;
 	case EVP_PKEY_DH:
-		ret=EVP_PK_DH|EVP_PKT_EXCH;
-		break;	
+		ret = EVP_PK_DH|EVP_PKT_EXCH;
+		break;
 	case NID_id_GostR3410_94:
 	case NID_id_GostR3410_2001:
-		ret=EVP_PKT_EXCH|EVP_PKT_SIGN;
+		ret = EVP_PKT_EXCH|EVP_PKT_SIGN;
 		break;
 	default:
 		break;
 	}
 
-	i=OBJ_obj2nid(x->sig_alg->algorithm);
+	i = OBJ_obj2nid(x->sig_alg->algorithm);
 	if (i && OBJ_find_sigid_algs(i, NULL, &i)) {
-
 		switch (i) {
 		case NID_rsaEncryption:
 		case NID_rsa:
-			ret|=EVP_PKS_RSA;
+			ret |= EVP_PKS_RSA;
 			break;
 		case NID_dsa:
 		case NID_dsa_2:
-			ret|=EVP_PKS_DSA;
+			ret |= EVP_PKS_DSA;
 			break;
 		case NID_X9_62_id_ecPublicKey:
-			ret|=EVP_PKS_EC;
+			ret |= EVP_PKS_EC;
 			break;
 		default:
 			break;
@@ -121,8 +123,8 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
 
 	if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
 					   for, not bytes */
-		ret|=EVP_PKT_EXP;
-	if(pkey==NULL) EVP_PKEY_free(pk);
-	return(ret);
+	ret |= EVP_PKT_EXP;
+	if (pkey == NULL)
+		EVP_PKEY_free(pk);
+	return (ret);
 }
-