Merge from the ASN1 branch of new ASN1 code

[openssl.git] / crypto / x509v3 / v3_akey.c

diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index 8b1deca8d8859137a76e8ae88e4b058a7f9e3d15..9ca3c88cd43d67472826a0f4ee4f2b5286159474 100644 (file)
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
@@ -71,9 +71,9 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
 X509V3_EXT_METHOD v3_akey_id = {
 NID_authority_key_identifier, X509V3_EXT_MULTILINE,
 (X509V3_EXT_NEW)AUTHORITY_KEYID_new,
-AUTHORITY_KEYID_free,
+(X509V3_EXT_FREE)AUTHORITY_KEYID_free,
 (X509V3_EXT_D2I)d2i_AUTHORITY_KEYID,
-i2d_AUTHORITY_KEYID,
+(X509V3_EXT_I2D)i2d_AUTHORITY_KEYID,
 NULL, NULL,
 (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID,
 (X509V3_EXT_V2I)v2i_AUTHORITY_KEYID,
@@ -81,59 +81,13 @@ NULL,NULL,
 NULL
 };
 
+ASN1_SEQUENCE(AUTHORITY_KEYID) = {
+       ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
+       ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
+       ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
+} ASN1_SEQUENCE_END(AUTHORITY_KEYID);
 
-int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp)
-{
-       M_ASN1_I2D_vars(a);
-
-       M_ASN1_I2D_len_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING);
-       M_ASN1_I2D_len_IMP_opt (a->issuer, i2d_GENERAL_NAMES);
-       M_ASN1_I2D_len_IMP_opt (a->serial, i2d_ASN1_INTEGER);
-
-       M_ASN1_I2D_seq_total();
-
-       M_ASN1_I2D_put_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING, 0);
-       M_ASN1_I2D_put_IMP_opt (a->issuer, i2d_GENERAL_NAMES, 1);
-       M_ASN1_I2D_put_IMP_opt (a->serial, i2d_ASN1_INTEGER, 2);
-
-       M_ASN1_I2D_finish();
-}
-
-AUTHORITY_KEYID *AUTHORITY_KEYID_new(void)
-{
-       AUTHORITY_KEYID *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, AUTHORITY_KEYID);
-       ret->keyid = NULL;
-       ret->issuer = NULL;
-       ret->serial = NULL;
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_AUTHORITY_KEYID_NEW);
-}
-
-AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp,
-            long length)
-{
-       M_ASN1_D2I_vars(a,AUTHORITY_KEYID *,AUTHORITY_KEYID_new);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get_IMP_opt (ret->keyid, d2i_ASN1_OCTET_STRING, 0,
-                                                       V_ASN1_OCTET_STRING);
-       M_ASN1_D2I_get_IMP_opt (ret->issuer, d2i_GENERAL_NAMES, 1,
-                                                       V_ASN1_SEQUENCE);
-       M_ASN1_D2I_get_IMP_opt (ret->serial, d2i_ASN1_INTEGER, 2,
-                                                       V_ASN1_INTEGER);
-       M_ASN1_D2I_Finish(a, AUTHORITY_KEYID_free, ASN1_F_D2I_AUTHORITY_KEYID);
-}
-
-void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a)
-{
-       if (a == NULL) return;
-       ASN1_OCTET_STRING_free(a->keyid);
-       sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free);
-       ASN1_INTEGER_free (a->serial);
-       Free ((char *)a);
-}
+IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
             AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist)
@@ -142,7 +96,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
        if(akeyid->keyid) {
                tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length);
                X509V3_add_value("keyid", tmp, &extlist);
-               Free(tmp);
+               OPENSSL_free(tmp);
        }
        if(akeyid->issuer) 
                extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
@@ -150,7 +104,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
                tmp = hex_to_string(akeyid->serial->data,
                                                 akeyid->serial->length);
                X509V3_add_value("serial", tmp, &extlist);
-               Free(tmp);
+               OPENSSL_free(tmp);
        }
        return extlist;
 }
@@ -171,7 +125,7 @@ int i;
 CONF_VALUE *cnf;
 ASN1_OCTET_STRING *ikeyid = NULL;
 X509_NAME *isname = NULL;
-STACK_OF(GENERAL_NAME) * gens = NULL;
+GENERAL_NAMES * gens = NULL;
 GENERAL_NAME *gen = NULL;
 ASN1_INTEGER *serial = NULL;
 X509_EXTENSION *ext;
@@ -192,8 +146,6 @@ for(i = 0; i < sk_CONF_VALUE_num(values); i++) {
        }
 }
 
-
-
 if(!ctx || !ctx->issuer_cert) {
        if(ctx && (ctx->flags==CTX_TEST)) return AUTHORITY_KEYID_new();
        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_NO_ISSUER_CERTIFICATE);
@@ -214,7 +166,7 @@ if(keyid) {
 
 if((issuer && !ikeyid) || (issuer == 2)) {
        isname = X509_NAME_dup(X509_get_issuer_name(cert));
-       serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
+       serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));
        if(!isname || !serial) {
                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
                goto err;
@@ -224,7 +176,7 @@ if((issuer && !ikeyid) || (issuer == 2)) {
 if(!(akeyid = AUTHORITY_KEYID_new())) goto err;
 
 if(isname) {
-       if(!(gens = sk_GENERAL_NAME_new(NULL)) || !(gen = GENERAL_NAME_new())
+       if(!(gens = sk_GENERAL_NAME_new_null()) || !(gen = GENERAL_NAME_new())
                || !sk_GENERAL_NAME_push(gens, gen)) {
                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE);
                goto err;
@@ -241,8 +193,8 @@ return akeyid;
 
 err:
 X509_NAME_free(isname);
-ASN1_INTEGER_free(serial);
-ASN1_OCTET_STRING_free(ikeyid);
+M_ASN1_INTEGER_free(serial);
+M_ASN1_OCTET_STRING_free(ikeyid);
 return NULL;
 
 }