RT2193: #ifdef errors in bss_dgram.c

[oweals/openssl.git] / crypto / x509v3 / v3_genn.c

diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index dc5ceb09e10f3254e031d46813a49979a0bbc62f..b6283573013e07eca9294c3166e899ee519a6bf6 100644 (file)
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -1,9 +1,9 @@
 /* v3_genn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2008 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
@@ -67,14 +67,14 @@ 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);
+} 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);
+} ASN1_SEQUENCE_END(EDIPARTYNAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
 
@@ -90,12 +90,163 @@ ASN1_CHOICE(GENERAL_NAME) = {
        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);
+} 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);
+ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
+
+GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a)
+       {
+       return (GENERAL_NAME *) ASN1_dup((i2d_of_void *) i2d_GENERAL_NAME,
+                                        (d2i_of_void *) d2i_GENERAL_NAME,
+                                        (char *) a);
+       }
+
+/* Returns 0 if they are equal, != 0 otherwise. */
+int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b)
+       {
+       int result = -1;
+
+       if (!a || !b || a->type != b->type) return -1;
+       switch(a->type)
+               {
+       case GEN_X400:
+       case GEN_EDIPARTY:
+               result = ASN1_TYPE_cmp(a->d.other, b->d.other);
+               break;
+
+       case GEN_OTHERNAME:
+               result = OTHERNAME_cmp(a->d.otherName, b->d.otherName);
+               break;
+
+       case GEN_EMAIL:
+       case GEN_DNS:
+       case GEN_URI:
+               result = ASN1_STRING_cmp(a->d.ia5, b->d.ia5);
+               break;
+
+       case GEN_DIRNAME:
+               result = X509_NAME_cmp(a->d.dirn, b->d.dirn);
+               break;
+
+       case GEN_IPADD:
+               result = ASN1_OCTET_STRING_cmp(a->d.ip, b->d.ip);
+               break;
+       
+       case GEN_RID:
+               result = OBJ_cmp(a->d.rid, b->d.rid);
+               break;
+               }
+       return result;
+       }
+
+/* Returns 0 if they are equal, != 0 otherwise. */
+int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b)
+       {
+       int result = -1;
+
+       if (!a || !b) return -1;
+       /* Check their type first. */
+       if ((result = OBJ_cmp(a->type_id, b->type_id)) != 0)
+               return result;
+       /* Check the value. */
+       result = ASN1_TYPE_cmp(a->value, b->value);
+       return result;
+       }
+
+void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value)
+       {
+       switch(type)
+               {
+       case GEN_X400:
+       case GEN_EDIPARTY:
+               a->d.other = value;
+               break;
+
+       case GEN_OTHERNAME:
+               a->d.otherName = value;
+               break;
+
+       case GEN_EMAIL:
+       case GEN_DNS:
+       case GEN_URI:
+               a->d.ia5 = value;
+               break;
+
+       case GEN_DIRNAME:
+               a->d.dirn = value;
+               break;
+
+       case GEN_IPADD:
+               a->d.ip = value;
+               break;
+       
+       case GEN_RID:
+               a->d.rid = value;
+               break;
+               }
+       a->type = type;
+       }
+
+void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype)
+       {
+       if (ptype)
+               *ptype = a->type;
+       switch(a->type)
+               {
+       case GEN_X400:
+       case GEN_EDIPARTY:
+               return a->d.other;
+
+       case GEN_OTHERNAME:
+               return a->d.otherName;
+
+       case GEN_EMAIL:
+       case GEN_DNS:
+       case GEN_URI:
+               return a->d.ia5;
+
+       case GEN_DIRNAME:
+               return a->d.dirn;
+
+       case GEN_IPADD:
+               return a->d.ip;
+       
+       case GEN_RID:
+               return a->d.rid;
+
+       default:
+               return NULL;
+               }
+       }
+
+int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
+                               ASN1_OBJECT *oid, ASN1_TYPE *value)
+       {
+       OTHERNAME *oth;
+       oth = OTHERNAME_new();
+       if (!oth)
+               return 0;
+       oth->type_id = oid;
+       oth->value = value;
+       GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth);
+       return 1;
+       }
+
+int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, 
+                               ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
+       {
+       if (gen->type != GEN_OTHERNAME)
+               return 0;
+       if (poid)
+               *poid = gen->d.otherName->type_id;
+       if (pvalue)
+               *pvalue = gen->d.otherName->value;
+       return 1;
+       }
+