projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rewrite the extension code to use an ASN1_ITEM structure
[openssl.git] / crypto / x509v3 / v3_alt.c
diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index 76f1b633c53a0485d568e3502d3b2af86b14bd2b..c370f8c0bde68292a80c2451dba087236a8cfc9d 100644 (file)
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -57,66 +57,45 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
-#include "x509v3.h"
-
-#ifndef NOPROTO
-STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
-STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
-static int copy_email(X509V3_CTX *ctx, STACK *gens);
-static int copy_issuer(X509V3_CTX *ctx, STACK *gens);
-#else
-STACK *v2i_issuer_alt();
-STACK *v2i_subject_alt();
-static int copy_email();
-static int copy_issuer();
-#endif
-
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+
+static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens);
+static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
 X509V3_EXT_METHOD v3_alt[] = {
-{ NID_subject_alt_name, 0,
-(X509V3_EXT_NEW)GENERAL_NAMES_new,
-GENERAL_NAMES_free,
-(X509V3_EXT_D2I)d2i_GENERAL_NAMES,
-i2d_GENERAL_NAMES,
-NULL, NULL,
+{ NID_subject_alt_name, 0, &GENERAL_NAMES_it,
+0,0,0,0,
+0,0,
 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
 (X509V3_EXT_V2I)v2i_subject_alt,
-NULL, NULL},
-{ NID_issuer_alt_name, 0,
-(X509V3_EXT_NEW)GENERAL_NAMES_new,
-GENERAL_NAMES_free,
-(X509V3_EXT_D2I)d2i_GENERAL_NAMES,
-i2d_GENERAL_NAMES,
-NULL, NULL,
+NULL, NULL, NULL},
+
+{ NID_issuer_alt_name, 0, &GENERAL_NAMES_it,
+0,0,0,0,
+0,0,
 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
 (X509V3_EXT_V2I)v2i_issuer_alt,
-NULL, NULL},
-EXT_END
+NULL, NULL, NULL},
 };
 
-STACK *i2v_GENERAL_NAMES(method, gens, ret)
-X509V3_EXT_METHOD *method;
-STACK *gens;
-STACK *ret;
+STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
+               GENERAL_NAMES *gens, STACK_OF(CONF_VALUE) *ret)
 {
        int i;
        GENERAL_NAME *gen;
-       for(i = 0; i < sk_num(gens); i++) {
-               gen = (GENERAL_NAME *)sk_value(gens, i);
+       for(i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
+               gen = sk_GENERAL_NAME_value(gens, i);
                ret = i2v_GENERAL_NAME(method, gen, ret);
        }
+       if(!ret) return sk_CONF_VALUE_new_null();
        return ret;
 }
 
-STACK *i2v_GENERAL_NAME(method, gen, ret)
-X509V3_EXT_METHOD *method;
-GENERAL_NAME *gen;
-STACK *ret;
+STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
+                               GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret)
 {
        char oline[256];
        unsigned char *p;
@@ -135,15 +114,15 @@ STACK *ret;
                break;
 
                case GEN_EMAIL:
-               X509V3_add_value("email",gen->d.ia5->data, &ret);
+               X509V3_add_value_uchar("email",gen->d.ia5->data, &ret);
                break;
 
                case GEN_DNS:
-               X509V3_add_value("DNS",gen->d.ia5->data, &ret);
+               X509V3_add_value_uchar("DNS",gen->d.ia5->data, &ret);
                break;
 
                case GEN_URI:
-               X509V3_add_value("URI",gen->d.ia5->data, &ret);
+               X509V3_add_value_uchar("URI",gen->d.ia5->data, &ret);
                break;
 
                case GEN_DIRNAME:
@@ -170,20 +149,18 @@ STACK *ret;
        return ret;
 }
 
-STACK *v2i_issuer_alt(method, ctx, nval)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-STACK *nval;
+static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
-       STACK *gens = NULL;
+       GENERAL_NAMES *gens = NULL;
        CONF_VALUE *cnf;
        int i;
-       if(!(gens = sk_new(NULL))) {
+       if(!(gens = sk_GENERAL_NAME_new_null())) {
                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       for(i = 0; i < sk_num(nval); i++) {
-               cnf = (CONF_VALUE *)sk_value(nval, i);
+       for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+               cnf = sk_CONF_VALUE_value(nval, i);
                if(!name_cmp(cnf->name, "issuer") && cnf->value &&
                                                !strcmp(cnf->value, "copy")) {
                        if(!copy_issuer(ctx, gens)) goto err;
@@ -191,23 +168,21 @@ STACK *nval;
                        GENERAL_NAME *gen;
                        if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
                                                                 goto err; 
-                       sk_push(gens, (char *)gen);
+                       sk_GENERAL_NAME_push(gens, gen);
                }
        }
        return gens;
        err:
-       sk_pop_free(gens, GENERAL_NAME_free);
+       sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
        return NULL;
 }
 
 /* Append subject altname of issuer to issuer alt name of subject */
 
-static int copy_issuer(ctx, gens)
-X509V3_CTX *ctx;
-STACK *gens;
+static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
 {
-       STACK *ialt;
-       char *gen;
+       GENERAL_NAMES *ialt;
+       GENERAL_NAME *gen;
        X509_EXTENSION *ext;
        int i;
        if(ctx && (ctx->flags == CTX_TEST)) return 1;
@@ -218,19 +193,19 @@ STACK *gens;
         i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
        if(i < 0) return 1;
         if(!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
-                        !(ialt = (STACK *) X509V3_EXT_d2i(ext)) ) {
+                        !(ialt = X509V3_EXT_d2i(ext)) ) {
                X509V3err(X509V3_F_COPY_ISSUER,X509V3_R_ISSUER_DECODE_ERROR);
                goto err;
        }
 
-       for(i = 0; i < sk_num(ialt); i++) {
-               gen = sk_value(ialt, i);
-               if(!sk_push(gens, gen)) {
+       for(i = 0; i < sk_GENERAL_NAME_num(ialt); i++) {
+               gen = sk_GENERAL_NAME_value(ialt, i);
+               if(!sk_GENERAL_NAME_push(gens, gen)) {
                        X509V3err(X509V3_F_COPY_ISSUER,ERR_R_MALLOC_FAILURE);
                        goto err;
                }
        }
-       sk_free(ialt);
+       sk_GENERAL_NAME_free(ialt);
 
        return 1;
                
@@ -239,20 +214,18 @@ STACK *gens;
        
 }
 
-STACK *v2i_subject_alt(method, ctx, nval)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-STACK *nval;
+static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
-       STACK *gens = NULL;
+       GENERAL_NAMES *gens = NULL;
        CONF_VALUE *cnf;
        int i;
-       if(!(gens = sk_new(NULL))) {
+       if(!(gens = sk_GENERAL_NAME_new_null())) {
                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       for(i = 0; i < sk_num(nval); i++) {
-               cnf = (CONF_VALUE *)sk_value(nval, i);
+       for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+               cnf = sk_CONF_VALUE_value(nval, i);
                if(!name_cmp(cnf->name, "email") && cnf->value &&
                                                !strcmp(cnf->value, "copy")) {
                        if(!copy_email(ctx, gens)) goto err;
@@ -260,12 +233,12 @@ STACK *nval;
                        GENERAL_NAME *gen;
                        if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
                                                                 goto err; 
-                       sk_push(gens, (char *)gen);
+                       sk_GENERAL_NAME_push(gens, gen);
                }
        }
        return gens;
        err:
-       sk_pop_free(gens, GENERAL_NAME_free);
+       sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
        return NULL;
 }
 
@@ -273,9 +246,7 @@ STACK *nval;
  * GENERAL_NAMES
  */
 
-static int copy_email(ctx, gens)
-X509V3_CTX *ctx;
-STACK *gens;
+static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens)
 {
        X509_NAME *nm;
        ASN1_IA5STRING *email = NULL;
@@ -296,7 +267,7 @@ STACK *gens;
        while((i = X509_NAME_get_index_by_NID(nm,
                                         NID_pkcs9_emailAddress, i)) > 0) {
                ne = X509_NAME_get_entry(nm, i);
-               email = ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
+               email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
                if(!email || !(gen = GENERAL_NAME_new())) {
                        X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE);
                        goto err;
@@ -304,7 +275,7 @@ STACK *gens;
                gen->d.ia5 = email;
                email = NULL;
                gen->type = GEN_EMAIL;
-               if(!sk_push(gens, (char *)gen)) {
+               if(!sk_GENERAL_NAME_push(gens, gen)) {
                        X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE);
                        goto err;
                }
@@ -316,39 +287,35 @@ STACK *gens;
                
        err:
        GENERAL_NAME_free(gen);
-       ASN1_IA5STRING_free(email);
+       M_ASN1_IA5STRING_free(email);
        return 0;
        
 }
 
-STACK *v2i_GENERAL_NAMES(method, ctx, nval)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-STACK *nval;
+GENERAL_NAMES *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method,
+                               X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
        GENERAL_NAME *gen;
-       STACK *gens = NULL;
+       GENERAL_NAMES *gens = NULL;
        CONF_VALUE *cnf;
        int i;
-       if(!(gens = sk_new(NULL))) {
+       if(!(gens = sk_GENERAL_NAME_new_null())) {
                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       for(i = 0; i < sk_num(nval); i++) {
-               cnf = (CONF_VALUE *)sk_value(nval, i);
+       for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+               cnf = sk_CONF_VALUE_value(nval, i);
                if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) goto err; 
-               sk_push(gens, (char *)gen);
+               sk_GENERAL_NAME_push(gens, gen);
        }
        return gens;
        err:
-       sk_pop_free(gens, GENERAL_NAME_free);
+       sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
        return NULL;
 }
 
-GENERAL_NAME *v2i_GENERAL_NAME(method, ctx, cnf)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-CONF_VALUE *cnf;
+GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
+                                                        CONF_VALUE *cnf)
 {
 char is_string = 0;
 int type;
@@ -398,7 +365,7 @@ if(!name_cmp(name, "email")) {
                goto err;
        }
        ip[0] = i1; ip[1] = i2 ; ip[2] = i3 ; ip[3] = i4;
-       if(!(gen->d.ip = ASN1_OCTET_STRING_new()) ||
+       if(!(gen->d.ip = M_ASN1_OCTET_STRING_new()) ||
                !ASN1_STRING_set(gen->d.ip, ip, 4)) {
                        X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
                        goto err;
@@ -411,8 +378,9 @@ if(!name_cmp(name, "email")) {
 }
 
 if(is_string) {
-       if(!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
-                     !ASN1_STRING_set(gen->d.ia5, value, strlen(value))) {
+       if(!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
+                     !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
+                                      strlen(value))) {
                X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
                goto err;
        }
Unnamed repository; edit this file 'description' to name the repository.