From a1df5b66c7ad477a535e56a504d8da47e1998cfa Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Fri, 18 Apr 2014 00:58:49 +0000
Subject: lob a few more knf grenades in here to soften things up.

---
 src/lib/libcrypto/asn1/f_enum.c | 49 ++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

(limited to 'src/lib/libcrypto/asn1/f_enum.c')

diff --git a/src/lib/libcrypto/asn1/f_enum.c b/src/lib/libcrypto/asn1/f_enum.c
index b6e66ab194..4ccfbddf2a 100644
--- a/src/lib/libcrypto/asn1/f_enum.c
+++ b/src/lib/libcrypto/asn1/f_enum.c
@@ -71,17 +71,12 @@ int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a)
 
 	if (a == NULL) return(0);
 
-	if (a->length == 0)
-	{
+	if (a->length == 0) {
 		if (BIO_write(bp,"00",2) != 2) goto err;
 		n=2;
-	}
-	else
-	{
-		for (i=0; i<a->length; i++)
-		{
-			if ((i != 0) && (i%35 == 0))
-			{
+	} else {
+		for (i=0; i<a->length; i++) {
+			if ((i != 0) && (i%35 == 0)) {
 				if (BIO_write(bp,"\\\n",2) != 2) goto err;
 				n+=2;
 			}
@@ -107,8 +102,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 	bs->type=V_ASN1_ENUMERATED;
 
 	bufsize=BIO_gets(bp,buf,size);
-	for (;;)
-	{
+	for (;;) {
 		if (bufsize < 1) goto err_sl;
 		i=bufsize;
 		if (buf[i-1] == '\n') buf[--i]='\0';
@@ -117,12 +111,10 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 		if (i == 0) goto err_sl;
 		again=(buf[i-1] == '\\');
 
-		for (j=0; j<i; j++)
-		{
+		for (j=0; j<i; j++) {
 			if (!(	((buf[j] >= '0') && (buf[j] <= '9')) ||
 				((buf[j] >= 'a') && (buf[j] <= 'f')) ||
-				((buf[j] >= 'A') && (buf[j] <= 'F'))))
-			{
+				((buf[j] >= 'A') && (buf[j] <= 'F')))) {
 				i=j;
 				break;
 			}
@@ -133,33 +125,28 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 		if (i < 2) goto err_sl;
 
 		bufp=(unsigned char *)buf;
-		if (first)
-		{
+		if (first) {
 			first=0;
-			if ((bufp[0] == '0') && (buf[1] == '0'))
-			{
+			if ((bufp[0] == '0') && (buf[1] == '0')) {
 				bufp+=2;
 				i-=2;
 			}
 		}
 		k=0;
 		i-=again;
-		if (i%2 != 0)
-		{
+		if (i%2 != 0) {
 			ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_ODD_NUMBER_OF_CHARS);
 			goto err;
 		}
 		i/=2;
-		if (num+i > slen)
-		{
+		if (num+i > slen) {
 			if (s == NULL)
 				sp=(unsigned char *)malloc(
 					(unsigned int)num+i*2);
 			else
 				sp=(unsigned char *)realloc(s,
 					(unsigned int)num+i*2);
-			if (sp == NULL)
-			{
+			if (sp == NULL) {
 				ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
 				if (s != NULL) free(s);
 				goto err;
@@ -167,10 +154,8 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 			s=sp;
 			slen=num+i*2;
 		}
-		for (j=0; j<i; j++,k+=2)
-		{
-			for (n=0; n<2; n++)
-			{
+		for (j=0; j<i; j++,k+=2) {
+			for (n=0; n<2; n++) {
 				m=bufp[k+n];
 				if ((m >= '0') && (m <= '9'))
 					m-='0';
@@ -178,8 +163,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 					m=m-'a'+10;
 				else if ((m >= 'A') && (m <= 'F'))
 					m=m-'A'+10;
-				else
-				{
+				else {
 					ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_NON_HEX_CHARACTERS);
 					goto err;
 				}
@@ -197,8 +181,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
 	bs->data=s;
 	ret=1;
 err:
-	if (0)
-	{
+	if (0) {
 err_sl:
 		ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_SHORT_LINE);
 	}
-- 
cgit v1.2.3-55-g6feb