diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2001-02-23 03:16:09 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2001-02-23 03:16:09 +0000 |
commit | bb5ea36b962453c4d74dab15ac1897725a02707d (patch) | |
tree | 3bf427b77627b9c2a45c7f6288deda545822ccca /crypto/x509v3 | |
parent | e3a91640739c4c016e234550ed913e7f7f6970f9 (diff) |
Initial support for ASN1_ITEM_FUNCTION option to
change the way ASN1 modules are exported.
Still needs a bit of work for example the hack which a
dummy function prototype to avoid compilers warning about
multiple ;s.
Diffstat (limited to 'crypto/x509v3')
-rw-r--r-- | crypto/x509v3/v3_akey.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_alt.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_bcons.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_conf.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_cpols.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_crld.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_enum.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_extku.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_info.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_int.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_lib.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_ocsp.c | 12 | ||||
-rw-r--r-- | crypto/x509v3/v3_pku.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_prn.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_skey.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_sxnet.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 6 |
17 files changed, 28 insertions, 28 deletions
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c index cb1ca21362..0e11d0c9bc 100644 --- a/crypto/x509v3/v3_akey.c +++ b/crypto/x509v3/v3_akey.c @@ -69,7 +69,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); X509V3_EXT_METHOD v3_akey_id = { -NID_authority_key_identifier, X509V3_EXT_MULTILINE, &AUTHORITY_KEYID_it, +NID_authority_key_identifier, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID, diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c index 13a4dcf45c..f7dabc4f2b 100644 --- a/crypto/x509v3/v3_alt.c +++ b/crypto/x509v3/v3_alt.c @@ -66,14 +66,14 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, 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, &GENERAL_NAMES_it, +{ NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_GENERAL_NAMES, (X509V3_EXT_V2I)v2i_subject_alt, NULL, NULL, NULL}, -{ NID_issuer_alt_name, 0, &GENERAL_NAMES_it, +{ NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_GENERAL_NAMES, diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c index 1f2ed4e996..94c64b7c8b 100644 --- a/crypto/x509v3/v3_bcons.c +++ b/crypto/x509v3/v3_bcons.c @@ -69,7 +69,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V X509V3_EXT_METHOD v3_bcons = { NID_basic_constraints, 0, -&BASIC_CONSTRAINTS_it, +ASN1_ITEM_ref(BASIC_CONSTRAINTS), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_BASIC_CONSTRAINTS, diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index 0890f898be..07f4d3ffe7 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -153,7 +153,7 @@ static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, } ext = do_ext_i2d(method, ext_nid, crit, ext_struc); - if(method->it) ASN1_item_free(ext_struc, method->it); + if(method->it) ASN1_item_free(ext_struc, ASN1_ITEM_ptr(method->it)); else method->ext_free(ext_struc); return ext; @@ -169,7 +169,7 @@ static X509_EXTENSION *do_ext_i2d(X509V3_EXT_METHOD *method, int ext_nid, /* Convert internal representation to DER */ if(method->it) { ext_der = NULL; - ext_len = ASN1_item_i2d(ext_struc, &ext_der, method->it); + ext_len = ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it)); if(ext_len < 0) goto merr; } else { unsigned char *p; diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c index ea84ad4ae9..b3428e7fb8 100644 --- a/crypto/x509v3/v3_cpols.c +++ b/crypto/x509v3/v3_cpols.c @@ -76,7 +76,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx, static STACK_OF(ASN1_INTEGER) *nref_nos(STACK_OF(CONF_VALUE) *nos); X509V3_EXT_METHOD v3_cpols = { -NID_certificate_policies, 0,&CERTIFICATEPOLICIES_it, +NID_certificate_policies, 0,ASN1_ITEM_ref(CERTIFICATEPOLICIES), 0,0,0,0, 0,0, 0,0, diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c index 7944ecf13a..794cdca27e 100644 --- a/crypto/x509v3/v3_crld.c +++ b/crypto/x509v3/v3_crld.c @@ -69,7 +69,7 @@ static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); X509V3_EXT_METHOD v3_crld = { -NID_crl_distribution_points, X509V3_EXT_MULTILINE, &CRL_DIST_POINTS_it, +NID_crl_distribution_points, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(CRL_DIST_POINTS), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_crld, diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c index 4bb6eb1f42..010c9d6260 100644 --- a/crypto/x509v3/v3_enum.c +++ b/crypto/x509v3/v3_enum.c @@ -73,7 +73,7 @@ static ENUMERATED_NAMES crl_reasons[] = { }; X509V3_EXT_METHOD v3_crl_reason = { -NID_crl_reason, 0, &ASN1_ENUMERATED_it, +NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED), 0,0,0,0, (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE, 0, diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c index a02644ae79..8bcc94fd0d 100644 --- a/crypto/x509v3/v3_extku.c +++ b/crypto/x509v3/v3_extku.c @@ -70,7 +70,7 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method, X509V3_EXT_METHOD v3_ext_ku = { NID_ext_key_usage, 0, - &EXTENDED_KEY_USAGE_it, + ASN1_ITEM_ref(EXTENDED_KEY_USAGE), 0,0,0,0, 0,0, i2v_EXTENDED_KEY_USAGE, @@ -82,7 +82,7 @@ X509V3_EXT_METHOD v3_ext_ku = { /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */ X509V3_EXT_METHOD v3_ocsp_accresp = { NID_id_pkix_OCSP_acceptableResponses, 0, - &EXTENDED_KEY_USAGE_it, + ASN1_ITEM_ref(EXTENDED_KEY_USAGE), 0,0,0,0, 0,0, i2v_EXTENDED_KEY_USAGE, diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c index 9ec9ab26ff..0bbd582c43 100644 --- a/crypto/x509v3/v3_info.c +++ b/crypto/x509v3/v3_info.c @@ -70,7 +70,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *metho X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); X509V3_EXT_METHOD v3_info = -{ NID_info_access, X509V3_EXT_MULTILINE, &AUTHORITY_INFO_ACCESS_it, +{ NID_info_access, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS), 0,0,0,0, 0,0, (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS, diff --git a/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c index 473a9868a6..f34cbfb731 100644 --- a/crypto/x509v3/v3_int.c +++ b/crypto/x509v3/v3_int.c @@ -61,7 +61,7 @@ #include <openssl/x509v3.h> X509V3_EXT_METHOD v3_crl_num = { -NID_crl_number, 0, &ASN1_INTEGER_it, +NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER), 0,0,0,0, (X509V3_EXT_I2S)i2s_ASN1_INTEGER, 0, diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c index 9ea59fb8f9..482ca8ccf5 100644 --- a/crypto/x509v3/v3_lib.c +++ b/crypto/x509v3/v3_lib.c @@ -165,7 +165,7 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext) unsigned char *p; if(!(method = X509V3_EXT_get(ext))) return NULL; p = ext->value->data; - if(method->it) return ASN1_item_d2i(NULL, &p, ext->value->length, method->it); + if(method->it) return ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it)); return method->d2i(NULL, &p, ext->value->length); } diff --git a/crypto/x509v3/v3_ocsp.c b/crypto/x509v3/v3_ocsp.c index c3e553afee..083112314e 100644 --- a/crypto/x509v3/v3_ocsp.c +++ b/crypto/x509v3/v3_ocsp.c @@ -81,7 +81,7 @@ static void *s2i_ocsp_nocheck(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char * static int i2r_ocsp_serviceloc(X509V3_EXT_METHOD *method, void *in, BIO *bp, int ind); X509V3_EXT_METHOD v3_ocsp_crlid = { - NID_id_pkix_OCSP_CrlID, 0, &OCSP_CRLID_it, + NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID), 0,0,0,0, 0,0, 0,0, @@ -90,7 +90,7 @@ X509V3_EXT_METHOD v3_ocsp_crlid = { }; X509V3_EXT_METHOD v3_ocsp_acutoff = { - NID_id_pkix_OCSP_archiveCutoff, 0, &ASN1_GENERALIZEDTIME_it, + NID_id_pkix_OCSP_archiveCutoff, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME), 0,0,0,0, 0,0, 0,0, @@ -99,7 +99,7 @@ X509V3_EXT_METHOD v3_ocsp_acutoff = { }; X509V3_EXT_METHOD v3_crl_invdate = { - NID_invalidity_date, 0, &ASN1_GENERALIZEDTIME_it, + NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME), 0,0,0,0, 0,0, 0,0, @@ -108,7 +108,7 @@ X509V3_EXT_METHOD v3_crl_invdate = { }; X509V3_EXT_METHOD v3_crl_hold = { - NID_hold_instruction_code, 0, &ASN1_OBJECT_it, + NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT), 0,0,0,0, 0,0, 0,0, @@ -129,7 +129,7 @@ X509V3_EXT_METHOD v3_ocsp_nonce = { }; X509V3_EXT_METHOD v3_ocsp_nocheck = { - NID_id_pkix_OCSP_noCheck, 0, &ASN1_NULL_it, + NID_id_pkix_OCSP_noCheck, 0, ASN1_ITEM_ref(ASN1_NULL), 0,0,0,0, 0,s2i_ocsp_nocheck, 0,0, @@ -138,7 +138,7 @@ X509V3_EXT_METHOD v3_ocsp_nocheck = { }; X509V3_EXT_METHOD v3_ocsp_serviceloc = { - NID_id_pkix_OCSP_serviceLocator, 0, &OCSP_SERVICELOC_it, + NID_id_pkix_OCSP_serviceLocator, 0, ASN1_ITEM_ref(OCSP_SERVICELOC), 0,0,0,0, 0,0, 0,0, diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c index c52c4793cb..b48089396d 100644 --- a/crypto/x509v3/v3_pku.c +++ b/crypto/x509v3/v3_pku.c @@ -67,7 +67,7 @@ static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *u static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); */ X509V3_EXT_METHOD v3_pkey_usage_period = { -NID_private_key_usage_period, 0, &PKEY_USAGE_PERIOD_it, +NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD), 0,0,0,0, 0,0,0,0, (X509V3_EXT_I2R)i2r_PKEY_USAGE_PERIOD, NULL, diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c index c5e29fb825..aeaf6170fe 100644 --- a/crypto/x509v3/v3_prn.c +++ b/crypto/x509v3/v3_prn.c @@ -116,7 +116,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde if(!(method = X509V3_EXT_get(ext))) return unknown_ext_print(out, ext, flag, indent, 0); p = ext->value->data; - if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, method->it); + if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it)); else ext_str = method->d2i(NULL, &p, ext->value->length); if(!ext_str) return unknown_ext_print(out, ext, flag, indent, 1); @@ -156,7 +156,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde err: sk_CONF_VALUE_pop_free(nval, X509V3_conf_free); if(value) OPENSSL_free(value); - if(method->it) ASN1_item_free(ext_str, method->it); + if(method->it) ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it)); else method->ext_free(ext_str); return ok; } diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c index 3e1eb05430..94bc6b8c2e 100644 --- a/crypto/x509v3/v3_skey.c +++ b/crypto/x509v3/v3_skey.c @@ -63,7 +63,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); X509V3_EXT_METHOD v3_skey_id = { -NID_subject_key_identifier, 0, &ASN1_OCTET_STRING_it, +NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING), 0,0,0,0, (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING, (X509V3_EXT_S2I)s2i_skey_id, diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c index 751315e695..24e14026a9 100644 --- a/crypto/x509v3/v3_sxnet.c +++ b/crypto/x509v3/v3_sxnet.c @@ -73,7 +73,7 @@ static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); #endif X509V3_EXT_METHOD v3_sxnet = { -NID_sxnet, X509V3_EXT_MULTILINE, &SXNET_it, +NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET), 0,0,0,0, 0,0, 0, diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 29421b754d..da770dcd7c 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -89,7 +89,7 @@ struct v3_ext_method { int ext_nid; int ext_flags; /* If this is set the following four fields are ignored */ -const ASN1_ITEM *it; +ASN1_ITEM_EXP *it; /* Old style ASN1 calls */ X509V3_EXT_NEW ext_new; X509V3_EXT_FREE ext_free; @@ -294,7 +294,7 @@ DECLARE_ASN1_SET_OF(POLICYINFO) X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) #define X509V3_set_ctx_nodb(ctx) ctx->db = NULL; -#define EXT_BITSTRING(nid, table) { nid, 0, &ASN1_BIT_STRING_it, \ +#define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \ 0,0,0,0, \ 0,0, \ (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \ @@ -302,7 +302,7 @@ DECLARE_ASN1_SET_OF(POLICYINFO) NULL, NULL, \ table} -#define EXT_IA5STRING(nid) { nid, 0, &ASN1_IA5STRING_it, \ +#define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \ 0,0,0,0, \ (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \ (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \ |