Merge from the ASN1 branch of new ASN1 code

to main trunk.

Lets see if the makes it to openssl-cvs :-)

1 files changed, 37 insertions, 227 deletions

diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index d447514..dc5ceb0 100644
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -59,233 +59,43 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1t.h>
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
-int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp)
-{
-	unsigned char *p;
-	int ret;
-
-	ret = 0;
-
-	/* Save the location of initial TAG */
-	if(pp) p = *pp;
-	else p = NULL;
-
-	/* GEN_DNAME needs special treatment because of EXPLICIT tag */
-
-	if(a->type == GEN_DIRNAME) {
-		int v = 0;
-		M_ASN1_I2D_len_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v);
-		if(!p) return ret;
-		M_ASN1_I2D_put_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v);
-		*pp = p;
-		return ret;
-	}
-
-	switch(a->type) {
-
-		case GEN_X400:
-		case GEN_EDIPARTY:
-		ret = i2d_ASN1_TYPE(a->d.other, pp);
-		break;
-
-		case GEN_OTHERNAME:
-		ret = i2d_OTHERNAME(a->d.otherName, pp);
-		break;
-
-		case GEN_EMAIL:
-		case GEN_DNS:
-		case GEN_URI:
-		ret = i2d_ASN1_IA5STRING(a->d.ia5, pp);
-		break;
-
-		case GEN_IPADD:
-		ret = i2d_ASN1_OCTET_STRING(a->d.ip, pp);
-		break;
-	
-		case GEN_RID:
-		ret = i2d_ASN1_OBJECT(a->d.rid, pp);
-		break;
-	}
-	/* Replace TAG with IMPLICIT value */
-	if(p) *p = (*p & V_ASN1_CONSTRUCTED) | a->type;
-	return ret;
-}
-
-GENERAL_NAME *GENERAL_NAME_new()
-{
-	GENERAL_NAME *ret=NULL;
-	ASN1_CTX c;
-	M_ASN1_New_Malloc(ret, GENERAL_NAME);
-	ret->type = -1;
-	ret->d.ptr = NULL;
-	return (ret);
-	M_ASN1_New_Error(ASN1_F_GENERAL_NAME_NEW);
-}
-
-GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp,
-								 long length)
-{
-	unsigned char _tmp;
-	M_ASN1_D2I_vars(a,GENERAL_NAME *,GENERAL_NAME_new);
-	M_ASN1_D2I_Init();
-	c.slen = length;
-
-	_tmp = M_ASN1_next;
-	ret->type = _tmp & ~V_ASN1_CONSTRUCTED;
-
-	switch(ret->type) {
-		/* Just put these in a "blob" for now */
-		case GEN_X400:
-		case GEN_EDIPARTY:
-		M_ASN1_D2I_get_imp(ret->d.other, d2i_ASN1_TYPE,V_ASN1_SEQUENCE);
-		break;
-
-		case GEN_OTHERNAME:
-		M_ASN1_D2I_get_imp(ret->d.otherName, d2i_OTHERNAME,V_ASN1_SEQUENCE);
-		break;
-
-		case GEN_EMAIL:
-		case GEN_DNS:
-		case GEN_URI:
-		M_ASN1_D2I_get_imp(ret->d.ia5, d2i_ASN1_IA5STRING,
-							V_ASN1_IA5STRING);
-		break;
-
-		case GEN_DIRNAME:
-		M_ASN1_D2I_get_EXP_opt(ret->d.dirn, d2i_X509_NAME, 4);
-		break;
-
-		case GEN_IPADD:
-		M_ASN1_D2I_get_imp(ret->d.ip, d2i_ASN1_OCTET_STRING,
-							V_ASN1_OCTET_STRING);
-		break;
-	
-		case GEN_RID:
-		M_ASN1_D2I_get_imp(ret->d.rid, d2i_ASN1_OBJECT,V_ASN1_OBJECT);
-		break;
-
-		default:
-		c.error = ASN1_R_BAD_TAG;
-		goto err;
-	}
-
-	c.slen = 0;
-	M_ASN1_D2I_Finish(a, GENERAL_NAME_free, ASN1_F_D2I_GENERAL_NAME);
-}
-
-void GENERAL_NAME_free(GENERAL_NAME *a)
-{
-	if (a == NULL) return;
-	switch(a->type) {
-		case GEN_X400:
-		case GEN_EDIPARTY:
-		ASN1_TYPE_free(a->d.other);
-		break;
-
-		case GEN_OTHERNAME:
-		OTHERNAME_free(a->d.otherName);
-		break;
-
-		case GEN_EMAIL:
-		case GEN_DNS:
-		case GEN_URI:
-
-		M_ASN1_IA5STRING_free(a->d.ia5);
-		break;
-
-		case GEN_DIRNAME:
-		X509_NAME_free(a->d.dirn);
-		break;
-
-		case GEN_IPADD:
-		M_ASN1_OCTET_STRING_free(a->d.ip);
-		break;
-	
-		case GEN_RID:
-		ASN1_OBJECT_free(a->d.rid);
-		break;
-
-	}
-	OPENSSL_free (a);
-}
-
-/* Now the GeneralNames versions: a SEQUENCE OF GeneralName. These are needed as
- * explicit functions.
- */
-
-STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new()
-{
-	return sk_GENERAL_NAME_new_null();
-}
-
-void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a)
-{
-	sk_GENERAL_NAME_pop_free(a, GENERAL_NAME_free);
-}
-
-STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a,
-					 unsigned char **pp, long length)
-{
-return d2i_ASN1_SET_OF_GENERAL_NAME(a, pp, length, d2i_GENERAL_NAME,
-			 GENERAL_NAME_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-}
-
-int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp)
-{
-return i2d_ASN1_SET_OF_GENERAL_NAME(a, pp, i2d_GENERAL_NAME, V_ASN1_SEQUENCE,
-						 V_ASN1_UNIVERSAL, IS_SEQUENCE);
-}
-
-IMPLEMENT_STACK_OF(GENERAL_NAME)
-IMPLEMENT_ASN1_SET_OF(GENERAL_NAME)
-
-int i2d_OTHERNAME(OTHERNAME *a, unsigned char **pp)
-{
-	int v = 0;
-	M_ASN1_I2D_vars(a);
-
-	M_ASN1_I2D_len(a->type_id, i2d_ASN1_OBJECT);
-	M_ASN1_I2D_len_EXP_opt(a->value, i2d_ASN1_TYPE, 0, v);
-
-	M_ASN1_I2D_seq_total();
-
-	M_ASN1_I2D_put(a->type_id, i2d_ASN1_OBJECT);
-	M_ASN1_I2D_put_EXP_opt(a->value, i2d_ASN1_TYPE, 0, v);
-
-	M_ASN1_I2D_finish();
-}
-
-OTHERNAME *OTHERNAME_new(void)
-{
-	OTHERNAME *ret=NULL;
-	ASN1_CTX c;
-	M_ASN1_New_Malloc(ret, OTHERNAME);
-	ret->type_id = OBJ_nid2obj(NID_undef);
-	M_ASN1_New(ret->value, ASN1_TYPE_new);
-	return (ret);
-	M_ASN1_New_Error(ASN1_F_OTHERNAME_NEW);
-}
-
-OTHERNAME *d2i_OTHERNAME(OTHERNAME **a, unsigned char **pp, long length)
-{
-	M_ASN1_D2I_vars(a,OTHERNAME *,OTHERNAME_new);
-	M_ASN1_D2I_Init();
-	M_ASN1_D2I_start_sequence();
-	M_ASN1_D2I_get(ret->type_id, d2i_ASN1_OBJECT);
-	M_ASN1_D2I_get_EXP_opt(ret->value, d2i_ASN1_TYPE, 0);
-	M_ASN1_D2I_Finish(a, OTHERNAME_free, ASN1_F_D2I_OTHERNAME);
-}
-
-void OTHERNAME_free(OTHERNAME *a)
-{
-	if (a == NULL) return;
-	ASN1_OBJECT_free(a->type_id);
-	ASN1_TYPE_free(a->value);
-	OPENSSL_free (a);
-}
-
+ASN1_SEQUENCE(OTHERNAME) = {
+	ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
+	/* Maybe have a true ANY DEFINED BY later */
+	ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
+} ASN1_SEQUENCE_END(OTHERNAME);
+
+IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
+
+ASN1_SEQUENCE(EDIPARTYNAME) = {
+	ASN1_IMP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
+	ASN1_IMP_OPT(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
+} ASN1_SEQUENCE_END(EDIPARTYNAME);
+
+IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
+
+ASN1_CHOICE(GENERAL_NAME) = {
+	ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
+	ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
+	ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
+	/* Don't decode this */
+	ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
+	/* X509_NAME is a CHOICE type so use EXPLICIT */
+	ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
+	ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
+	ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
+	ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
+	ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
+} ASN1_CHOICE_END(GENERAL_NAME);
+
+IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
+
+ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = 
+	ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
+ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES);
+
+IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)