More ASN1 reformat/tidy.

1 files changed, 130 insertions, 89 deletions

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 6a76a96ba9..2b9bb997de 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -3,7 +3,7 @@
  * project 2000.
  */
 /* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2000-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -64,27 +64,30 @@
 #include <openssl/asn1t.h>
 #include <string.h>
 
-static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine);
+static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
+								int combine);
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it)
-{
+	{
 	ASN1_VALUE *ret = NULL;
-	if(ASN1_item_ex_new(&ret, it) > 0) return ret;
+	if (ASN1_item_ex_new(&ret, it) > 0)
+		return ret;
 	return NULL;
-}
+	}
 
 /* Allocate an ASN1 structure */
 
 int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	return asn1_item_ex_combine_new(pval, it, 0);
-}
+	}
 
-static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
-{
+static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
+								int combine)
+	{
 	const ASN1_TEMPLATE *tt = NULL;
 	const ASN1_COMPAT_FUNCS *cf;
 	const ASN1_EXTERN_FUNCS *ef;
@@ -92,105 +95,125 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int
 	ASN1_aux_cb *asn1_cb;
 	ASN1_VALUE **pseqval;
 	int i;
-	if(aux && aux->asn1_cb) asn1_cb = aux->asn1_cb;
-	else asn1_cb = 0;
+	if (aux && aux->asn1_cb)
+		asn1_cb = aux->asn1_cb;
+	else
+		asn1_cb = 0;
 
-	if(!combine) *pval = NULL;
+	if (!combine) *pval = NULL;
 
 #ifdef CRYPTO_MDEBUG
-	if(it->sname) CRYPTO_push_info(it->sname);
+	if (it->sname)
+		CRYPTO_push_info(it->sname);
 #endif
 
-	switch(it->itype) {
+	switch(it->itype)
+		{
 
 		case ASN1_ITYPE_EXTERN:
 		ef = it->funcs;
-		if(ef && ef->asn1_ex_new) {
-			if(!ef->asn1_ex_new(pval, it))
+		if (ef && ef->asn1_ex_new)
+			{
+			if (!ef->asn1_ex_new(pval, it))
 				goto memerr;
-		}
+			}
 		break;
 
 		case ASN1_ITYPE_COMPAT:
 		cf = it->funcs;
-		if(cf && cf->asn1_new) {
+		if (cf && cf->asn1_new) {
 			*pval = cf->asn1_new();
-			if(!*pval) goto memerr;
+			if (!*pval)
+				goto memerr;
 		}
 		break;
 
 		case ASN1_ITYPE_PRIMITIVE:
-		if(it->templates) {
-			if(!ASN1_template_new(pval, it->templates))
+		if (it->templates)
+			{
+			if (!ASN1_template_new(pval, it->templates))
 				goto memerr;
-		} else {
-			if(!ASN1_primitive_new(pval, it))
+			}
+		else if (!ASN1_primitive_new(pval, it))
 				goto memerr;
-		}
 		break;
 
 		case ASN1_ITYPE_MSTRING:
-		if(!ASN1_primitive_new(pval, it))
+		if (!ASN1_primitive_new(pval, it))
 				goto memerr;
 		break;
 
 		case ASN1_ITYPE_CHOICE:
-		if(asn1_cb) {
+		if (asn1_cb)
+			{
 			i = asn1_cb(ASN1_OP_NEW_PRE, pval, it);
-			if(!i) goto auxerr;
-			if(i==2) {
+			if (!i)
+				goto auxerr;
+			if (i==2)
+				{
 #ifdef CRYPTO_MDEBUG
-				if(it->sname) CRYPTO_pop_info();
+				if (it->sname)
+					CRYPTO_pop_info();
 #endif
 				return 1;
+				}
 			}
-		}
-		if(!combine) {
+		if (!combine)
+			{
 			*pval = OPENSSL_malloc(it->size);
-			if(!*pval) goto memerr;
+			if (!*pval)
+				goto memerr;
 			memset(*pval, 0, it->size);
-		}
+			}
 		asn1_set_choice_selector(pval, -1, it);
-		if(asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it))
+		if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it))
 				goto auxerr;
 		break;
 
 		case ASN1_ITYPE_NDEF_SEQUENCE:
 		case ASN1_ITYPE_SEQUENCE:
-		if(asn1_cb) {
+		if (asn1_cb)
+			{
 			i = asn1_cb(ASN1_OP_NEW_PRE, pval, it);
-			if(!i) goto auxerr;
-			if(i==2) {
+			if (!i)
+				goto auxerr;
+			if (i==2)
+				{
 #ifdef CRYPTO_MDEBUG
-				if(it->sname) CRYPTO_pop_info();
+				if (it->sname)
+					CRYPTO_pop_info();
 #endif
 				return 1;
+				}
 			}
-		}
-		if(!combine) {
+		if (!combine)
+			{
 			*pval = OPENSSL_malloc(it->size);
-			if(!*pval) goto memerr;
+			if (!*pval)
+				goto memerr;
 			memset(*pval, 0, it->size);
 			asn1_do_lock(pval, 0, it);
 			asn1_enc_init(pval, it);
-		}
-		for(i = 0, tt = it->templates; i < it->tcount; tt++, i++) {
+			}
+		for (i = 0, tt = it->templates; i < it->tcount; tt++, i++)
+			{
 			pseqval = asn1_get_field_ptr(pval, tt);
-			if(!ASN1_template_new(pseqval, tt)) goto memerr;
-		}
-		if(asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it))
+			if (!ASN1_template_new(pseqval, tt))
+				goto memerr;
+			}
+		if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it))
 				goto auxerr;
 		break;
 	}
 #ifdef CRYPTO_MDEBUG
-	if(it->sname) CRYPTO_pop_info();
+	if (it->sname) CRYPTO_pop_info();
 #endif
 	return 1;
 
 	memerr:
 	ASN1err(ASN1_F_ASN1_ITEM_NEW, ERR_R_MALLOC_FAILURE);
 #ifdef CRYPTO_MDEBUG
-	if(it->sname) CRYPTO_pop_info();
+	if (it->sname) CRYPTO_pop_info();
 #endif
 	return 0;
 
@@ -198,28 +221,29 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int
 	ASN1err(ASN1_F_ASN1_ITEM_NEW, ASN1_R_AUX_ERROR);
 	ASN1_item_ex_free(pval, it);
 #ifdef CRYPTO_MDEBUG
-	if(it->sname) CRYPTO_pop_info();
+	if (it->sname) CRYPTO_pop_info();
 #endif
 	return 0;
 
-}
+	}
 
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	const ASN1_EXTERN_FUNCS *ef;
 
-	switch(it->itype) {
+	switch(it->itype)
+		{
 
 		case ASN1_ITYPE_EXTERN:
 		ef = it->funcs;
-		if(ef && ef->asn1_ex_clear) 
+		if (ef && ef->asn1_ex_clear) 
 			ef->asn1_ex_clear(pval, it);
 		else *pval = NULL;
 		break;
 
 
 		case ASN1_ITYPE_PRIMITIVE:
-		if(it->templates) 
+		if (it->templates) 
 			asn1_template_clear(pval, it->templates);
 		else
 			asn1_primitive_clear(pval, it);
@@ -235,73 +259,85 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
 		case ASN1_ITYPE_NDEF_SEQUENCE:
 		*pval = NULL;
 		break;
+		}
 	}
-}
 
 
 int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
-{
+	{
 	const ASN1_ITEM *it = ASN1_ITEM_ptr(tt->item);
 	int ret;
-	if(tt->flags & ASN1_TFLG_OPTIONAL) {
+	if (tt->flags & ASN1_TFLG_OPTIONAL)
+		{
 		asn1_template_clear(pval, tt);
 		return 1;
-	}
+		}
 	/* If ANY DEFINED BY nothing to do */
 
-	if(tt->flags & ASN1_TFLG_ADB_MASK) {
+	if (tt->flags & ASN1_TFLG_ADB_MASK)
+		{
 		*pval = NULL;
 		return 1;
-	}
+		}
 #ifdef CRYPTO_MDEBUG
-	if(tt->field_name) CRYPTO_push_info(tt->field_name);
+	if (tt->field_name)
+		CRYPTO_push_info(tt->field_name);
 #endif
 	/* If SET OF or SEQUENCE OF, its a STACK */
-	if(tt->flags & ASN1_TFLG_SK_MASK) {
+	if (tt->flags & ASN1_TFLG_SK_MASK)
+		{
 		STACK_OF(ASN1_VALUE) *skval;
 		skval = sk_ASN1_VALUE_new_null();
-		if(!skval) {
+		if (!skval)
+			{
 			ASN1err(ASN1_F_ASN1_TEMPLATE_NEW, ERR_R_MALLOC_FAILURE);
 			ret = 0;
 			goto done;
-		}
+			}
 		*pval = (ASN1_VALUE *)skval;
 		ret = 1;
 		goto done;
-	}
+		}
 	/* Otherwise pass it back to the item routine */
 	ret = asn1_item_ex_combine_new(pval, it, tt->flags & ASN1_TFLG_COMBINE);
 	done:
 #ifdef CRYPTO_MDEBUG
-	if(it->sname) CRYPTO_pop_info();
+	if (it->sname)
+		CRYPTO_pop_info();
 #endif
 	return ret;
-}
+	}
 
 static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
-{
+	{
 	/* If ADB or STACK just NULL the field */
-	if(tt->flags & (ASN1_TFLG_ADB_MASK|ASN1_TFLG_SK_MASK)) 
+	if (tt->flags & (ASN1_TFLG_ADB_MASK|ASN1_TFLG_SK_MASK)) 
 		*pval = NULL;
 	else
 		asn1_item_clear(pval, ASN1_ITEM_ptr(tt->item));
-}
+	}
 
 
-/* NB: could probably combine most of the real XXX_new() behaviour and junk all the old
- * functions.
+/* NB: could probably combine most of the real XXX_new() behaviour and junk
+ * all the old functions.
  */
 
 int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	ASN1_TYPE *typ;
 	int utype;
 	const ASN1_PRIMITIVE_FUNCS *pf;
 	pf = it->funcs;
-	if(pf && pf->prim_new) return pf->prim_new(pval, it);
-	if(!it || (it->itype == ASN1_ITYPE_MSTRING)) utype = -1;
-	else utype = it->utype;
-	switch(utype) {
+
+	if (pf && pf->prim_new)
+		return pf->prim_new(pval, it);
+
+	if (!it || (it->itype == ASN1_ITYPE_MSTRING))
+		utype = -1;
+	else
+		utype = it->utype;
+	switch(utype)
+		{
 		case V_ASN1_OBJECT:
 		*pval = (ASN1_VALUE *)OBJ_nid2obj(NID_undef);
 		return 1;
@@ -319,7 +355,8 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 
 		case V_ASN1_ANY:
 		typ = OPENSSL_malloc(sizeof(ASN1_TYPE));
-		if(!typ) return 0;
+		if (!typ)
+			return 0;
 		typ->value.ptr = NULL;
 		typ->type = -1;
 		*pval = (ASN1_VALUE *)typ;
@@ -328,26 +365,30 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 		default:
 		*pval = (ASN1_VALUE *)ASN1_STRING_type_new(utype);
 		break;
-	}
-	if(*pval) return 1;
+		}
+	if (*pval)
+		return 1;
 	return 0;
-}
+	}
 
 void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	int utype;
 	const ASN1_PRIMITIVE_FUNCS *pf;
 	pf = it->funcs;
-	if(pf) {
-		if(pf->prim_clear)
+	if (pf)
+		{
+		if (pf->prim_clear)
 			pf->prim_clear(pval, it);
 		else 
 			*pval = NULL;
 		return;
-	}
-	if(!it || (it->itype == ASN1_ITYPE_MSTRING)) utype = -1;
-	else utype = it->utype;
-	if(utype == V_ASN1_BOOLEAN)
+		}
+	if (!it || (it->itype == ASN1_ITYPE_MSTRING))
+		utype = -1;
+	else
+		utype = it->utype;
+	if (utype == V_ASN1_BOOLEAN)
 		*(ASN1_BOOLEAN *)pval = it->size;
 	else *pval = NULL;
-}
+	}