diff options
39 files changed, 338 insertions, 338 deletions
diff --git a/lib/auth/cert.c b/lib/auth/cert.c index 0b0f04b2b1..c4fc01f9e9 100644 --- a/lib/auth/cert.c +++ b/lib/auth/cert.c @@ -137,7 +137,7 @@ check_pk_algo_in_list(const gnutls_pk_algorithm_t * */ static int cert_get_issuer_dn(gnutls_pcert_st * cert, gnutls_datum_t * odn) { - ASN1_TYPE dn; + asn1_node dn; int len, result; int start, end; @@ -498,7 +498,7 @@ gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params, const gnutls_datum_t * pkcs3_params, gnutls_x509_crt_fmt_t format) { - ASN1_TYPE c2; + asn1_node c2; int result, need_free = 0; unsigned int q_bits; gnutls_datum_t _params; @@ -666,7 +666,7 @@ gnutls_dh_params_export2_pkcs3(gnutls_dh_params_t params, gnutls_x509_crt_fmt_t format, gnutls_datum_t * out) { - ASN1_TYPE c2; + asn1_node c2; int result; size_t g_size, p_size; uint8_t *p_data, *g_data; diff --git a/lib/global.c b/lib/global.c index a11523150f..3731418835 100644 --- a/lib/global.c +++ b/lib/global.c @@ -68,13 +68,13 @@ inline static int _gnutls_global_init_skip(void) #endif /* created by asn1c */ -extern const ASN1_ARRAY_TYPE gnutls_asn1_tab[]; -extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; +extern const asn1_static_node gnutls_asn1_tab[]; +extern const asn1_static_node pkix_asn1_tab[]; void *_gnutls_file_mutex; void *_gnutls_pkcs11_mutex; -ASN1_TYPE _gnutls_pkix1_asn = ASN1_TYPE_EMPTY; -ASN1_TYPE _gnutls_gnutls_asn = ASN1_TYPE_EMPTY; +asn1_node _gnutls_pkix1_asn = NULL; +asn1_node _gnutls_gnutls_asn = NULL; gnutls_log_func _gnutls_log_func = NULL; gnutls_audit_log_func _gnutls_audit_log_func = NULL; @@ -280,7 +280,7 @@ static int _gnutls_global_init(unsigned constructor) goto out; } - _gnutls_pkix1_asn = ASN1_TYPE_EMPTY; + _gnutls_pkix1_asn = NULL; res = asn1_array2tree(pkix_asn1_tab, &_gnutls_pkix1_asn, NULL); if (res != ASN1_SUCCESS) { gnutls_assert(); diff --git a/lib/global.h b/lib/global.h index d9a09d8cdd..e30187e7ad 100644 --- a/lib/global.h +++ b/lib/global.h @@ -28,15 +28,15 @@ int gnutls_is_secure_memory(const void *mem); -extern ASN1_TYPE _gnutls_pkix1_asn; -extern ASN1_TYPE _gnutls_gnutls_asn; +extern asn1_node _gnutls_pkix1_asn; +extern asn1_node _gnutls_gnutls_asn; -/* removed const from node_asn* to +/* removed const from asn1_node* to * prevent warnings, since libtasn1 doesn't * use the const keyword in its functions. */ -#define _gnutls_get_gnutls_asn() ((ASN1_TYPE) _gnutls_gnutls_asn) -#define _gnutls_get_pkix() ((ASN1_TYPE) _gnutls_pkix1_asn) +#define _gnutls_get_gnutls_asn() ((asn1_node) _gnutls_gnutls_asn) +#define _gnutls_get_pkix() ((asn1_node) _gnutls_pkix1_asn) extern gnutls_log_func _gnutls_log_func; extern gnutls_audit_log_func _gnutls_audit_log_func; @@ -330,7 +330,7 @@ _gnutls_mpi_bprint_size(const bigint_t a, uint8_t *buf, size_t size) * steps. */ static int -__gnutls_x509_read_int(ASN1_TYPE node, const char *value, +__gnutls_x509_read_int(asn1_node node, const char *value, bigint_t * ret_mpi, unsigned int flags) { int result; @@ -377,7 +377,7 @@ __gnutls_x509_read_int(ASN1_TYPE node, const char *value, } int -_gnutls_x509_read_int(ASN1_TYPE node, const char *value, +_gnutls_x509_read_int(asn1_node node, const char *value, bigint_t * ret_mpi) { return __gnutls_x509_read_int(node, value, ret_mpi, @@ -385,7 +385,7 @@ _gnutls_x509_read_int(ASN1_TYPE node, const char *value, } int -_gnutls_x509_read_key_int(ASN1_TYPE node, const char *value, +_gnutls_x509_read_key_int(asn1_node node, const char *value, bigint_t * ret_mpi) { return __gnutls_x509_read_int(node, value, ret_mpi, @@ -393,7 +393,7 @@ _gnutls_x509_read_key_int(ASN1_TYPE node, const char *value, } int -_gnutls_x509_read_key_int_le(ASN1_TYPE node, const char *value, +_gnutls_x509_read_key_int_le(asn1_node node, const char *value, bigint_t * ret_mpi) { return __gnutls_x509_read_int(node, value, ret_mpi, @@ -404,7 +404,7 @@ _gnutls_x509_read_key_int_le(ASN1_TYPE node, const char *value, /* Writes the specified integer into the specified node. */ static int -__gnutls_x509_write_int(ASN1_TYPE node, const char *value, bigint_t mpi, +__gnutls_x509_write_int(asn1_node node, const char *value, bigint_t mpi, unsigned int flags) { uint8_t *tmpstr; @@ -459,7 +459,7 @@ __gnutls_x509_write_int(ASN1_TYPE node, const char *value, bigint_t mpi, } int -_gnutls_x509_write_int(ASN1_TYPE node, const char *value, bigint_t mpi, +_gnutls_x509_write_int(asn1_node node, const char *value, bigint_t mpi, int lz) { return __gnutls_x509_write_int(node, value, mpi, @@ -467,7 +467,7 @@ _gnutls_x509_write_int(ASN1_TYPE node, const char *value, bigint_t mpi, } int -_gnutls_x509_write_key_int(ASN1_TYPE node, const char *value, bigint_t mpi, +_gnutls_x509_write_key_int(asn1_node node, const char *value, bigint_t mpi, int lz) { return __gnutls_x509_write_int(node, value, mpi, @@ -476,7 +476,7 @@ _gnutls_x509_write_key_int(ASN1_TYPE node, const char *value, bigint_t mpi, } int -_gnutls_x509_write_key_int_le(ASN1_TYPE node, const char *value, bigint_t mpi) +_gnutls_x509_write_key_int_le(asn1_node node, const char *value, bigint_t mpi) { return __gnutls_x509_write_int(node, value, mpi, GNUTLS_X509_INT_OVERWRITE | @@ -72,7 +72,7 @@ _gnutls_encode_ber_rs_raw(gnutls_datum_t * sig_value, const gnutls_datum_t * r, const gnutls_datum_t * s) { - ASN1_TYPE sig; + asn1_node sig; int result, ret; uint8_t *tmp = NULL; @@ -137,7 +137,7 @@ _gnutls_encode_ber_rs_raw(gnutls_datum_t * sig_value, int _gnutls_encode_ber_rs(gnutls_datum_t * sig_value, bigint_t r, bigint_t s) { - ASN1_TYPE sig; + asn1_node sig; int result; if ((result = @@ -178,7 +178,7 @@ int _gnutls_decode_ber_rs(const gnutls_datum_t * sig_value, bigint_t * r, bigint_t * s) { - ASN1_TYPE sig; + asn1_node sig; int result; if ((result = @@ -253,7 +253,7 @@ int _gnutls_decode_ber_rs_raw(const gnutls_datum_t * sig_value, gnutls_datum_t *r, gnutls_datum_t *s) { - ASN1_TYPE sig; + asn1_node sig; int result; if ((result = @@ -592,7 +592,7 @@ encode_ber_digest_info(const mac_entry_st * e, const gnutls_datum_t * digest, gnutls_datum_t * output) { - ASN1_TYPE dinfo = ASN1_TYPE_EMPTY; + asn1_node dinfo = NULL; int result; const char *algo; uint8_t *tmp_output; @@ -726,7 +726,7 @@ gnutls_decode_ber_digest_info(const gnutls_datum_t * info, gnutls_digest_algorithm_t * hash, unsigned char * digest, unsigned int *digest_size) { - ASN1_TYPE dinfo = ASN1_TYPE_EMPTY; + asn1_node dinfo = NULL; int result; char str[MAX(MAX_OID_SIZE, MAX_HASH_SIZE)]; int len; diff --git a/lib/pubkey.c b/lib/pubkey.c index e03aea709e..5fe30f798c 100644 --- a/lib/pubkey.c +++ b/lib/pubkey.c @@ -369,7 +369,7 @@ gnutls_pubkey_parse_ecc_eddsa_params(const gnutls_datum_t *parameters, gnutls_ecc_curve_t *outcurve) { gnutls_ecc_curve_t curve = GNUTLS_ECC_CURVE_INVALID; - ASN1_TYPE asn1 = ASN1_TYPE_EMPTY; + asn1_node asn1 = NULL; unsigned int etype = ASN1_ETYPE_INVALID; char str[MAX_OID_SIZE]; int str_size; @@ -622,7 +622,7 @@ gnutls_pubkey_export(gnutls_pubkey_t key, size_t * output_data_size) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; if (key == NULL) { gnutls_assert(); @@ -686,7 +686,7 @@ gnutls_pubkey_export2(gnutls_pubkey_t key, gnutls_x509_crt_fmt_t format, gnutls_datum_t * out) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; if (key == NULL) { gnutls_assert(); @@ -1223,7 +1223,7 @@ gnutls_pubkey_import(gnutls_pubkey_t key, { int result = 0, need_free = 0; gnutls_datum_t _data; - ASN1_TYPE spk; + asn1_node spk; if (key == NULL) { gnutls_assert(); @@ -79,7 +79,7 @@ _gnutls_gost_keytrans_encrypt(gnutls_pk_params_st *pub, gnutls_datum_t kek; gnutls_datum_t enc, imit; gnutls_digest_algorithm_t digalg; - ASN1_TYPE kx; + asn1_node kx; if (pub->algo == GNUTLS_PK_GOST_01) digalg = GNUTLS_DIG_GOSTR_94; @@ -176,7 +176,7 @@ _gnutls_gost_keytrans_decrypt(gnutls_pk_params_st *priv, gnutls_datum_t *out) { int ret; - ASN1_TYPE kx; + asn1_node kx; gnutls_pk_params_st pub; gnutls_datum_t kek; gnutls_datum_t ukm2, enc, imit; diff --git a/lib/x509/attributes.c b/lib/x509/attributes.c index 969dc9b80d..12b77a96d9 100644 --- a/lib/x509/attributes.c +++ b/lib/x509/attributes.c @@ -38,7 +38,7 @@ * index here starts from one. */ static int -overwrite_attribute(ASN1_TYPE asn, const char *root, unsigned indx, +overwrite_attribute(asn1_node asn, const char *root, unsigned indx, const gnutls_datum_t * ext_data) { char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; @@ -70,7 +70,7 @@ overwrite_attribute(ASN1_TYPE asn, const char *root, unsigned indx, * */ int -_x509_parse_attribute(ASN1_TYPE asn1_struct, +_x509_parse_attribute(asn1_node asn1_struct, const char *attr_name, const char *given_oid, unsigned indx, int raw, gnutls_datum_t * out) { @@ -185,7 +185,7 @@ _x509_parse_attribute(ASN1_TYPE asn1_struct, * Critical will be either 0 or 1. */ static int -add_attribute(ASN1_TYPE asn, const char *root, const char *attribute_id, +add_attribute(asn1_node asn, const char *root, const char *attribute_id, const gnutls_datum_t * ext_data) { int result; @@ -230,7 +230,7 @@ add_attribute(ASN1_TYPE asn, const char *root, const char *attribute_id, int -_x509_set_attribute(ASN1_TYPE asn, const char *root, +_x509_set_attribute(asn1_node asn, const char *root, const char *ext_id, const gnutls_datum_t * ext_data) { int result; diff --git a/lib/x509/attributes.h b/lib/x509/attributes.h index c148935b75..4ebb7dd34d 100644 --- a/lib/x509/attributes.h +++ b/lib/x509/attributes.h @@ -24,12 +24,12 @@ #define GNUTLS_LIB_X509_ATTRIBUTES_H int -_x509_parse_attribute(ASN1_TYPE asn1_struct, +_x509_parse_attribute(asn1_node asn1_struct, const char *attr_name, const char *given_oid, unsigned indx, int raw, gnutls_datum_t * out); int -_x509_set_attribute(ASN1_TYPE asn, const char *root, +_x509_set_attribute(asn1_node asn, const char *root, const char *ext_id, const gnutls_datum_t * ext_data); #endif /* GNUTLS_LIB_X509_ATTRIBUTES_H */ diff --git a/lib/x509/common.c b/lib/x509/common.c index 10c8db53c0..c156bd96a9 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -322,7 +322,7 @@ decode_complex_string(const struct oid_to_string *oentry, void *value, { char str[MAX_STRING_LEN], tmpname[128]; int len = -1, result; - ASN1_TYPE tmpasn = ASN1_TYPE_EMPTY; + asn1_node tmpasn = NULL; char asn1_err[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = ""; unsigned int etype; gnutls_datum_t td = {NULL, 0}; @@ -521,7 +521,7 @@ gnutls_x509_subject_alt_name_t _gnutls_x509_san_find_type(char *str_type) * to PEM or DER raw data. */ int -_gnutls_x509_export_int_named(ASN1_TYPE asn1_data, const char *name, +_gnutls_x509_export_int_named(asn1_node asn1_data, const char *name, gnutls_x509_crt_fmt_t format, const char *pem_header, unsigned char *output_data, @@ -566,7 +566,7 @@ _gnutls_x509_export_int_named(ASN1_TYPE asn1_data, const char *name, * to PEM or DER raw data. */ int -_gnutls_x509_export_int_named2(ASN1_TYPE asn1_data, const char *name, +_gnutls_x509_export_int_named2(asn1_node asn1_data, const char *name, gnutls_x509_crt_fmt_t format, const char *pem_header, gnutls_datum_t * out) @@ -669,7 +669,7 @@ _gnutls_x509_decode_string(unsigned int etype, * the required data size (and places a null byte). */ static int -x509_read_value(ASN1_TYPE c, const char *root, +x509_read_value(asn1_node c, const char *root, gnutls_datum_t * ret, unsigned allow_null) { int len = 0, result; @@ -741,14 +741,14 @@ x509_read_value(ASN1_TYPE c, const char *root, } int -_gnutls_x509_read_value(ASN1_TYPE c, const char *root, +_gnutls_x509_read_value(asn1_node c, const char *root, gnutls_datum_t * ret) { return x509_read_value(c, root, ret, 0); } int -_gnutls_x509_read_null_value(ASN1_TYPE c, const char *root, +_gnutls_x509_read_null_value(asn1_node c, const char *root, gnutls_datum_t * ret) { return x509_read_value(c, root, ret, 1); @@ -761,7 +761,7 @@ _gnutls_x509_read_null_value(ASN1_TYPE c, const char *root, * at the end of a readable string value (which is not accounted into size) */ int -_gnutls_x509_read_string(ASN1_TYPE c, const char *root, +_gnutls_x509_read_string(asn1_node c, const char *root, gnutls_datum_t * ret, unsigned int etype, unsigned int allow_ber) { int len = 0, result; @@ -846,18 +846,18 @@ int _gnutls_x509_encode_string(unsigned int etype, return 0; } -/* DER Encodes the src ASN1_TYPE and stores it to +/* DER Encodes the src asn1_node and stores it to * the given datum. If str is non zero then the data are encoded as * an OCTET STRING. */ int -_gnutls_x509_der_encode(ASN1_TYPE src, const char *src_name, +_gnutls_x509_der_encode(asn1_node src, const char *src_name, gnutls_datum_t * res, int str) { int size, result; int asize; uint8_t *data = NULL; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; size = 0; result = asn1_der_coding(src, src_name, NULL, &size, NULL); @@ -926,14 +926,14 @@ _gnutls_x509_der_encode(ASN1_TYPE src, const char *src_name, } -/* DER Encodes the src ASN1_TYPE and stores it to +/* DER Encodes the src asn1_node and stores it to * dest in dest_name. Useful to encode something and store it * as OCTET. If str is non null then the data are encoded as * an OCTET STRING. */ int -_gnutls_x509_der_encode_and_copy(ASN1_TYPE src, const char *src_name, - ASN1_TYPE dest, const char *dest_name, +_gnutls_x509_der_encode_and_copy(asn1_node src, const char *src_name, + asn1_node dest, const char *dest_name, int str) { int result; @@ -962,10 +962,10 @@ _gnutls_x509_der_encode_and_copy(ASN1_TYPE src, const char *src_name, return 0; } -/* Writes the value of the datum in the given ASN1_TYPE. +/* Writes the value of the datum in the given asn1_node. */ int -_gnutls_x509_write_value(ASN1_TYPE c, const char *root, +_gnutls_x509_write_value(asn1_node c, const char *root, const gnutls_datum_t * data) { int ret; @@ -981,10 +981,10 @@ _gnutls_x509_write_value(ASN1_TYPE c, const char *root, return 0; } -/* Writes the value of the datum in the given ASN1_TYPE as a string. +/* Writes the value of the datum in the given asn1_node as a string. */ int -_gnutls_x509_write_string(ASN1_TYPE c, const char *root, +_gnutls_x509_write_string(asn1_node c, const char *root, const gnutls_datum_t * data, unsigned int etype) { int ret; @@ -1031,7 +1031,7 @@ _asnstr_append_name(char *name, size_t name_size, const char *part1, * */ int -_gnutls_x509_encode_and_copy_PKI_params(ASN1_TYPE dst, +_gnutls_x509_encode_and_copy_PKI_params(asn1_node dst, const char *dst_name, const gnutls_pk_params_st * params) { @@ -1104,7 +1104,7 @@ _gnutls_x509_encode_PKI_params(gnutls_datum_t * der, const gnutls_pk_params_st * params) { int ret; - ASN1_TYPE tmp; + asn1_node tmp; ret = asn1_create_element(_gnutls_get_pkix(), "PKIX1.Certificate", &tmp); @@ -1137,7 +1137,7 @@ _gnutls_x509_encode_PKI_params(gnutls_datum_t * der, * ASN.1 structure. src_name should be something like "tbsCertificate.subjectPublicKeyInfo". */ int -_gnutls_x509_get_pk_algorithm(ASN1_TYPE src, const char *src_name, +_gnutls_x509_get_pk_algorithm(asn1_node src, const char *src_name, gnutls_ecc_curve_t *curve, unsigned int *bits) { @@ -1195,7 +1195,7 @@ _gnutls_x509_get_pk_algorithm(ASN1_TYPE src, const char *src_name, * returns them into signed_data. */ int -_gnutls_x509_get_signed_data(ASN1_TYPE src, const gnutls_datum_t *der, +_gnutls_x509_get_signed_data(asn1_node src, const gnutls_datum_t *der, const char *src_name, gnutls_datum_t * signed_data) { @@ -1232,7 +1232,7 @@ _gnutls_x509_get_signed_data(ASN1_TYPE src, const gnutls_datum_t *der, /*- * gnutls_x509_get_signature_algorithm: - * @src: should contain an ASN1_TYPE structure + * @src: should contain an asn1_node structure * @src_name: the description of the signature field * * This function will return a value of the #gnutls_sign_algorithm_t @@ -1243,7 +1243,7 @@ _gnutls_x509_get_signed_data(ASN1_TYPE src, const gnutls_datum_t *der, * error. -*/ int -_gnutls_x509_get_signature_algorithm(ASN1_TYPE src, const char *src_name) +_gnutls_x509_get_signature_algorithm(asn1_node src, const char *src_name) { int result; char name[128]; @@ -1302,7 +1302,7 @@ _gnutls_x509_get_signature_algorithm(ASN1_TYPE src, const char *src_name) * returns them into signed_data. */ int -_gnutls_x509_get_signature(ASN1_TYPE src, const char *src_name, +_gnutls_x509_get_signature(asn1_node src, const char *src_name, gnutls_datum_t * signature) { int result, len; @@ -1371,12 +1371,12 @@ static int is_printable(char p) return 0; } -static int write_complex_string(ASN1_TYPE asn_struct, const char *where, +static int write_complex_string(asn1_node asn_struct, const char *where, const struct oid_to_string *oentry, const uint8_t * data, size_t data_size) { char tmp[128]; - ASN1_TYPE c2; + asn1_node c2; int result; const char *string_type; unsigned int i; @@ -1442,7 +1442,7 @@ static int write_complex_string(ASN1_TYPE asn_struct, const char *where, */ int _gnutls_x509_encode_and_write_attribute(const char *given_oid, - ASN1_TYPE asn1_struct, + asn1_node asn1_struct, const char *where, const void *_data, int data_size, int multi) @@ -1547,7 +1547,7 @@ int _gnutls_strdatum_to_buf(gnutls_datum_t * d, void *buf, } int -_gnutls_x509_get_raw_field2(ASN1_TYPE c2, const gnutls_datum_t * raw, +_gnutls_x509_get_raw_field2(asn1_node c2, const gnutls_datum_t * raw, const char *whom, gnutls_datum_t * dn) { int result, len1; @@ -1918,7 +1918,7 @@ gnutls_gost_paramset_t gnutls_oid_to_gost_paramset(const char *oid) return gnutls_assert_val(GNUTLS_GOST_PARAMSET_UNKNOWN); } -int _gnutls_x509_get_version(ASN1_TYPE root, const char *name) +int _gnutls_x509_get_version(asn1_node root, const char *name) { uint8_t version[8]; int len, result; diff --git a/lib/x509/common.h b/lib/x509/common.h index 7bca9ddf42..4690d68825 100644 --- a/lib/x509/common.h +++ b/lib/x509/common.h @@ -126,10 +126,10 @@ struct oid_to_string { const struct oid_to_string *_gnutls_oid_get_entry(const struct oid_to_string *ots, const char *oid); -int _gnutls_x509_set_time(ASN1_TYPE c2, const char *where, time_t tim, +int _gnutls_x509_set_time(asn1_node c2, const char *where, time_t tim, int force_general); int -_gnutls_x509_set_raw_time(ASN1_TYPE c2, const char *where, time_t tim); +_gnutls_x509_set_raw_time(asn1_node c2, const char *where, time_t tim); int _gnutls_x509_decode_string(unsigned int etype, const uint8_t * der, size_t der_size, @@ -144,20 +144,20 @@ int _gnutls_x509_dn_to_string(const char *OID, void *value, int value_size, gnutls_datum_t * out); const char *_gnutls_ldap_string_to_oid(const char *str, unsigned str_len); -time_t _gnutls_x509_get_time(ASN1_TYPE c2, const char *when, int general); +time_t _gnutls_x509_get_time(asn1_node c2, const char *when, int general); gnutls_x509_subject_alt_name_t _gnutls_x509_san_find_type(char *str_type); -int _gnutls_x509_der_encode_and_copy(ASN1_TYPE src, const char *src_name, - ASN1_TYPE dest, const char *dest_name, +int _gnutls_x509_der_encode_and_copy(asn1_node src, const char *src_name, + asn1_node dest, const char *dest_name, int str); -int _gnutls_x509_der_encode(ASN1_TYPE src, const char *src_name, +int _gnutls_x509_der_encode(asn1_node src, const char *src_name, gnutls_datum_t * res, int str); #define _gnutls_x509_export_int(asn1, format, header, out, out_size) \ _gnutls_x509_export_int_named(asn1, "", format, header, out, out_size) -int _gnutls_x509_export_int_named(ASN1_TYPE asn1_data, const char *name, +int _gnutls_x509_export_int_named(asn1_node asn1_data, const char *name, gnutls_x509_crt_fmt_t format, const char *pem_header, unsigned char *output_data, @@ -165,59 +165,59 @@ int _gnutls_x509_export_int_named(ASN1_TYPE asn1_data, const char *name, #define _gnutls_x509_export_int2(asn1, format, header, out) \ _gnutls_x509_export_int_named2(asn1, "", format, header, out) -int _gnutls_x509_export_int_named2(ASN1_TYPE asn1_data, const char *name, +int _gnutls_x509_export_int_named2(asn1_node asn1_data, const char *name, gnutls_x509_crt_fmt_t format, const char *pem_header, gnutls_datum_t * out); -int _gnutls_x509_read_value(ASN1_TYPE c, const char *root, +int _gnutls_x509_read_value(asn1_node c, const char *root, gnutls_datum_t * ret); -int _gnutls_x509_read_null_value(ASN1_TYPE c, const char *root, +int _gnutls_x509_read_null_value(asn1_node c, const char *root, gnutls_datum_t * ret); -int _gnutls_x509_read_string(ASN1_TYPE c, const char *root, +int _gnutls_x509_read_string(asn1_node c, const char *root, gnutls_datum_t * ret, unsigned int etype, unsigned allow_ber); -int _gnutls_x509_write_value(ASN1_TYPE c, const char *root, +int _gnutls_x509_write_value(asn1_node c, const char *root, const gnutls_datum_t * data); -int _gnutls_x509_write_string(ASN1_TYPE c, const char *root, +int _gnutls_x509_write_string(asn1_node c, const char *root, const gnutls_datum_t * data, unsigned int etype); int _gnutls_x509_encode_and_write_attribute(const char *given_oid, - ASN1_TYPE asn1_struct, + asn1_node asn1_struct, const char *where, const void *data, int sizeof_data, int multi); -int _gnutls_x509_decode_and_read_attribute(ASN1_TYPE asn1_struct, +int _gnutls_x509_decode_and_read_attribute(asn1_node asn1_struct, const char *where, char *oid, int oid_size, gnutls_datum_t * value, int multi, int octet); -int _gnutls_x509_get_pk_algorithm(ASN1_TYPE src, const char *src_name, +int _gnutls_x509_get_pk_algorithm(asn1_node src, const char *src_name, gnutls_ecc_curve_t *curve, unsigned int *bits); int -_gnutls_x509_get_signature_algorithm(ASN1_TYPE src, const char *src_name); +_gnutls_x509_get_signature_algorithm(asn1_node src, const char *src_name); -int _gnutls_x509_encode_and_copy_PKI_params(ASN1_TYPE dst, +int _gnutls_x509_encode_and_copy_PKI_params(asn1_node dst, const char *dst_name, const gnutls_pk_params_st * params); int _gnutls_x509_encode_PKI_params(gnutls_datum_t * der, const gnutls_pk_params_st * params); -int _gnutls_asn1_copy_node(ASN1_TYPE * dst, const char *dst_name, - ASN1_TYPE src, const char *src_name); +int _gnutls_asn1_copy_node(asn1_node * dst, const char *dst_name, + asn1_node src, const char *src_name); -int _gnutls_x509_get_signed_data(ASN1_TYPE src, const gnutls_datum_t *der, +int _gnutls_x509_get_signed_data(asn1_node src, const gnutls_datum_t *der, const char *src_name, gnutls_datum_t * signed_data); -int _gnutls_x509_get_signature(ASN1_TYPE src, const char *src_name, +int _gnutls_x509_get_signature(asn1_node src, const char *src_name, gnutls_datum_t * signature); -int _gnutls_get_asn_mpis(ASN1_TYPE asn, const char *root, +int _gnutls_get_asn_mpis(asn1_node asn, const char *root, gnutls_pk_params_st * params); int _gnutls_get_key_id(gnutls_pk_params_st *, @@ -229,13 +229,13 @@ void _asnstr_append_name(char *name, size_t name_size, const char *part1, /* Given a @c2 which it returns an allocated DER encoding of @whom in @out */ inline static int -_gnutls_x509_get_raw_field(ASN1_TYPE c2, const char *whom, gnutls_datum_t *out) +_gnutls_x509_get_raw_field(asn1_node c2, const char *whom, gnutls_datum_t *out) { return _gnutls_x509_der_encode(c2, whom, out, 0); } int -_gnutls_x509_get_raw_field2(ASN1_TYPE c2, const gnutls_datum_t * raw, +_gnutls_x509_get_raw_field2(asn1_node c2, const gnutls_datum_t * raw, const char *whom, gnutls_datum_t * dn); unsigned @@ -256,11 +256,11 @@ unsigned _gnutls_check_key_purpose(gnutls_x509_crt_t cert, const char *purpose, time_t _gnutls_x509_generalTime2gtime(const char *ttime); -int _gnutls_get_extension(ASN1_TYPE asn, const char *root, +int _gnutls_get_extension(asn1_node asn, const char *root, const char *extension_id, int indx, gnutls_datum_t * ret, unsigned int *_critical); -int _gnutls_set_extension(ASN1_TYPE asn, const char *root, +int _gnutls_set_extension(asn1_node asn, const char *root, const char *ext_id, const gnutls_datum_t * ext_data, unsigned int critical); @@ -276,7 +276,7 @@ int _gnutls_x509_decode_ext(const gnutls_datum_t *der, gnutls_x509_ext_st *out); int _gnutls_x509_raw_crt_to_raw_pubkey(const gnutls_datum_t * cert, gnutls_datum_t * rpubkey); -int _gnutls_x509_get_version(ASN1_TYPE root, const char *name); +int _gnutls_x509_get_version(asn1_node root, const char *name); int x509_crt_to_raw_pubkey(gnutls_x509_crt_t crt, gnutls_datum_t * rpubkey); diff --git a/lib/x509/crl.c b/lib/x509/crl.c index aea8bc6d33..d9e7ce0722 100644 --- a/lib/x509/crl.c +++ b/lib/x509/crl.c @@ -842,13 +842,13 @@ int _gnutls_x509_crl_cpy(gnutls_x509_crl_t dest, gnutls_x509_crl_t src) } static int -_get_authority_key_id(gnutls_x509_crl_t cert, ASN1_TYPE * c2, +_get_authority_key_id(gnutls_x509_crl_t cert, asn1_node * c2, unsigned int *critical) { int ret; gnutls_datum_t id; - *c2 = ASN1_TYPE_EMPTY; + *c2 = NULL; if (cert == NULL) { gnutls_assert(); @@ -920,7 +920,7 @@ gnutls_x509_crl_get_authority_key_gn_serial(gnutls_x509_crl_t crl, unsigned int *critical) { int ret, result, len; - ASN1_TYPE c2; + asn1_node c2; ret = _get_authority_key_id(crl, &c2, critical); if (ret < 0) @@ -985,7 +985,7 @@ gnutls_x509_crl_get_authority_key_id(gnutls_x509_crl_t crl, void *id, unsigned int *critical) { int result, len, ret; - ASN1_TYPE c2; + asn1_node c2; ret = _get_authority_key_id(crl, &c2, critical); if (ret < 0) diff --git a/lib/x509/crq.c b/lib/x509/crq.c index 3cb2d1c418..26030220ab 100644 --- a/lib/x509/crq.c +++ b/lib/x509/crq.c @@ -204,7 +204,7 @@ gnutls_x509_crq_get_private_key_usage_period(gnutls_x509_crq_t crq, unsigned int *critical) { int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; uint8_t buf[128]; size_t buf_size = sizeof(buf); @@ -1316,7 +1316,7 @@ gnutls_x509_crq_get_extension_info(gnutls_x509_crq_t crq, unsigned indx, char name[MAX_NAME_SIZE]; char *extensions = NULL; size_t extensions_size = 0; - ASN1_TYPE c2; + asn1_node c2; int len; if (!crq) { @@ -1477,7 +1477,7 @@ gnutls_x509_crq_get_extension_data2(gnutls_x509_crq_t crq, char name[MAX_NAME_SIZE]; unsigned char *extensions = NULL; size_t extensions_size = 0; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (!crq) { gnutls_assert(); @@ -1669,7 +1669,7 @@ get_subject_alt_name(gnutls_x509_crq_t crq, unsigned int *critical, int othername_oid) { int result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_x509_subject_alt_name_t type; gnutls_datum_t dnsname = { NULL, 0 }; size_t dns_size = 0; @@ -2289,7 +2289,7 @@ gnutls_x509_crq_get_key_purpose_oid(gnutls_x509_crq_t crq, char tmpstr[MAX_NAME_SIZE]; int result, len; gnutls_datum_t prev = { NULL, 0 }; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; size_t prev_size = 0; if (oid) @@ -2389,7 +2389,7 @@ gnutls_x509_crq_set_key_purpose_oid(gnutls_x509_crq_t crq, { int result; gnutls_datum_t prev = { NULL, 0 }, der_data; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; size_t prev_size = 0; /* Read existing extension, if there is one. @@ -2785,7 +2785,7 @@ gnutls_x509_crq_set_private_key_usage_period(gnutls_x509_crq_t crq, { int result; gnutls_datum_t der_data; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (crq == NULL) { gnutls_assert(); diff --git a/lib/x509/dn.c b/lib/x509/dn.c index 33739e2271..c13119edfa 100644 --- a/lib/x509/dn.c +++ b/lib/x509/dn.c @@ -33,7 +33,7 @@ * Name (you need a parser just to read a name in the X.509 protocols!!!) */ -static int append_elements(ASN1_TYPE asn1_struct, const char *asn1_rdn_name, gnutls_buffer_st *str, int k1, unsigned last) +static int append_elements(asn1_node asn1_struct, const char *asn1_rdn_name, gnutls_buffer_st *str, int k1, unsigned last) { int k2, result, max_k2; int len; @@ -197,7 +197,7 @@ static int append_elements(ASN1_TYPE asn1_struct, const char *asn1_rdn_name, gnu } int -_gnutls_x509_get_dn(ASN1_TYPE asn1_struct, +_gnutls_x509_get_dn(asn1_node asn1_struct, const char *asn1_rdn_name, gnutls_datum_t * dn, unsigned flags) { @@ -258,7 +258,7 @@ _gnutls_x509_get_dn(ASN1_TYPE asn1_struct, * That is to point in the rndSequence. */ int -_gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, +_gnutls_x509_parse_dn(asn1_node asn1_struct, const char *asn1_rdn_name, char *buf, size_t * buf_size, unsigned flags) { @@ -314,7 +314,7 @@ _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, * OID found, 1 the second etc. */ int -_gnutls_x509_parse_dn_oid(ASN1_TYPE asn1_struct, +_gnutls_x509_parse_dn_oid(asn1_node asn1_struct, const char *asn1_rdn_name, const char *given_oid, int indx, unsigned int raw_flag, gnutls_datum_t * out) @@ -476,7 +476,7 @@ _gnutls_x509_parse_dn_oid(ASN1_TYPE asn1_struct, * OID found, 1 the second etc. */ int -_gnutls_x509_get_dn_oid(ASN1_TYPE asn1_struct, +_gnutls_x509_get_dn_oid(asn1_node asn1_struct, const char *asn1_rdn_name, int indx, void *_oid, size_t * sizeof_oid) { @@ -603,7 +603,7 @@ _gnutls_x509_get_dn_oid(ASN1_TYPE asn1_struct, */ static int _gnutls_x509_write_attribute(const char *given_oid, - ASN1_TYPE asn1_struct, const char *where, + asn1_node asn1_struct, const char *where, const void *_data, int sizeof_data) { char tmp[128]; @@ -645,7 +645,7 @@ _gnutls_x509_write_attribute(const char *given_oid, * The output is allocated and stored in value. */ int -_gnutls_x509_decode_and_read_attribute(ASN1_TYPE asn1_struct, +_gnutls_x509_decode_and_read_attribute(asn1_node asn1_struct, const char *where, char *oid, int oid_size, gnutls_datum_t * value, int multi, @@ -701,7 +701,7 @@ _gnutls_x509_decode_and_read_attribute(ASN1_TYPE asn1_struct, * */ int -_gnutls_x509_set_dn_oid(ASN1_TYPE asn1_struct, +_gnutls_x509_set_dn_oid(asn1_node asn1_struct, const char *asn1_name, const char *given_oid, int raw_flag, const char *name, int sizeof_name) { @@ -888,7 +888,7 @@ gnutls_x509_rdn_get_by_oid(const gnutls_datum_t * idn, const char *oid, void *buf, size_t * buf_size) { int result; - ASN1_TYPE dn = ASN1_TYPE_EMPTY; + asn1_node dn = NULL; gnutls_datum_t td; if (buf_size == 0) { @@ -943,7 +943,7 @@ gnutls_x509_rdn_get_oid(const gnutls_datum_t * idn, unsigned indx, void *buf, size_t * buf_size) { int result; - ASN1_TYPE dn = ASN1_TYPE_EMPTY; + asn1_node dn = NULL; if (buf_size == 0) { return GNUTLS_E_INVALID_REQUEST; diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c index c9fef21a12..9e5b72bbd3 100644 --- a/lib/x509/extensions.c +++ b/lib/x509/extensions.c @@ -34,7 +34,7 @@ #include <datum.h> int -_gnutls_get_extension(ASN1_TYPE asn, const char *root, +_gnutls_get_extension(asn1_node asn, const char *root, const char *extension_id, int indx, gnutls_datum_t * ret, unsigned int *_critical) { @@ -131,7 +131,7 @@ _gnutls_get_extension(ASN1_TYPE asn, const char *root, } static int -get_indx_extension(ASN1_TYPE asn, const char *root, +get_indx_extension(asn1_node asn, const char *root, int indx, gnutls_datum_t * out) { char name[MAX_NAME_SIZE]; @@ -226,7 +226,7 @@ gnutls_x509_crl_get_extension_data2(gnutls_x509_crl_t crl, * If you have passed the last extension, GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will * be returned. */ -static int get_extension_oid(ASN1_TYPE asn, const char *root, +static int get_extension_oid(asn1_node asn, const char *root, unsigned indx, void *oid, size_t * sizeof_oid) { int k, result, len; @@ -313,7 +313,7 @@ _gnutls_x509_crl_get_extension_oid(gnutls_x509_crl_t crl, * Critical will be either 0 or 1. */ static int -add_extension(ASN1_TYPE asn, const char *root, const char *extension_id, +add_extension(asn1_node asn, const char *root, const char *extension_id, const gnutls_datum_t * ext_data, unsigned int critical) { int result; @@ -375,7 +375,7 @@ add_extension(ASN1_TYPE asn, const char *root, const char *extension_id, * index here starts from one. */ static int -overwrite_extension(ASN1_TYPE asn, const char *root, unsigned int indx, +overwrite_extension(asn1_node asn, const char *root, unsigned int indx, const gnutls_datum_t * ext_data, unsigned int critical) { char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; @@ -414,7 +414,7 @@ overwrite_extension(ASN1_TYPE asn, const char *root, unsigned int indx, } int -_gnutls_set_extension(ASN1_TYPE asn, const char *root, +_gnutls_set_extension(asn1_node asn, const char *root, const char *ext_id, const gnutls_datum_t * ext_data, unsigned int critical) { @@ -525,7 +525,7 @@ _gnutls_x509_crq_set_extension(gnutls_x509_crq_t crq, unsigned char *extensions = NULL; size_t extensions_size = 0; gnutls_datum_t der; - ASN1_TYPE c2; + asn1_node c2; int result; result = @@ -614,7 +614,7 @@ _gnutls_x509_ext_extract_number(uint8_t * number, size_t * _nr_size, uint8_t * extnValue, int extnValueLen) { - ASN1_TYPE ext = ASN1_TYPE_EMPTY; + asn1_node ext = NULL; int result; int nr_size = *_nr_size; @@ -656,7 +656,7 @@ int _gnutls_x509_ext_gen_number(const uint8_t * number, size_t nr_size, gnutls_datum_t * der_ext) { - ASN1_TYPE ext = ASN1_TYPE_EMPTY; + asn1_node ext = NULL; int result; result = @@ -687,7 +687,7 @@ _gnutls_x509_ext_gen_number(const uint8_t * number, size_t nr_size, } int -_gnutls_write_general_name(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_general_name(asn1_node ext, const char *ext_name, gnutls_x509_subject_alt_name_t type, const void *data, unsigned int data_size) { @@ -742,7 +742,7 @@ _gnutls_write_general_name(ASN1_TYPE ext, const char *ext_name, } int -_gnutls_write_new_general_name(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_new_general_name(asn1_node ext, const char *ext_name, gnutls_x509_subject_alt_name_t type, const void *data, unsigned int data_size) { @@ -773,7 +773,7 @@ _gnutls_write_new_general_name(ASN1_TYPE ext, const char *ext_name, } int -_gnutls_write_new_othername(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_new_othername(asn1_node ext, const char *ext_name, const char *oid, const void *data, unsigned int data_size) { diff --git a/lib/x509/key_decode.c b/lib/x509/key_decode.c index 00378af94d..c7e69d8e1f 100644 --- a/lib/x509/key_decode.c +++ b/lib/x509/key_decode.c @@ -58,7 +58,7 @@ _gnutls_x509_read_rsa_pubkey(uint8_t * der, int dersize, gnutls_pk_params_st * params) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; if ((result = asn1_create_element (_gnutls_get_gnutls_asn(), "GNUTLS.RSAPublicKey", &spk)) @@ -175,7 +175,7 @@ _gnutls_x509_read_dsa_params(uint8_t * der, int dersize, gnutls_pk_params_st * params) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; if ((result = asn1_create_element (_gnutls_get_pkix(), "PKIX1.Dss-Parms", @@ -241,7 +241,7 @@ _gnutls_x509_read_ecc_params(uint8_t * der, int dersize, unsigned int * curve) { int ret; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; char oid[MAX_OID_SIZE]; int oid_size; @@ -294,8 +294,8 @@ _gnutls_x509_read_rsa_pss_params(uint8_t * der, int dersize, gnutls_x509_spki_st * params) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; + asn1_node c2 = NULL; gnutls_digest_algorithm_t digest; char oid[MAX_OID_SIZE] = ""; int size; @@ -442,7 +442,7 @@ _gnutls_x509_read_gost_params(uint8_t * der, int dersize, gnutls_pk_algorithm_t algo) { int ret; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; char oid[MAX_OID_SIZE]; int oid_size; gnutls_ecc_curve_t curve; diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c index 3e9e0466bc..c3ff2a9b05 100644 --- a/lib/x509/key_encode.c +++ b/lib/x509/key_encode.c @@ -56,7 +56,7 @@ _gnutls_x509_write_rsa_pubkey(const gnutls_pk_params_st * params, gnutls_datum_t * der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; der->data = NULL; der->size = 0; @@ -302,7 +302,7 @@ _gnutls_x509_write_dsa_params(const gnutls_pk_params_st * params, gnutls_datum_t * der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; der->data = NULL; der->size = 0; @@ -362,7 +362,7 @@ _gnutls_x509_write_ecc_params(const gnutls_ecc_curve_t curve, gnutls_datum_t * der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; const char *oid; der->data = NULL; @@ -413,8 +413,8 @@ _gnutls_x509_write_rsa_pss_params(const gnutls_x509_spki_st *params, gnutls_datum_t *der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; + asn1_node c2 = NULL; const char *oid; gnutls_datum_t tmp = { NULL, 0 }; @@ -531,7 +531,7 @@ _gnutls_x509_write_gost_params(const gnutls_pk_params_st * params, gnutls_datum_t * der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; const char *oid; der->data = NULL; @@ -629,7 +629,7 @@ _gnutls_x509_write_dsa_pubkey(const gnutls_pk_params_st * params, gnutls_datum_t * der) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; der->data = NULL; der->size = 0; @@ -669,7 +669,7 @@ _gnutls_x509_write_dsa_pubkey(const gnutls_pk_params_st * params, /* Encodes the RSA parameters into an ASN.1 RSA private key structure. */ static int -_gnutls_asn1_encode_rsa(ASN1_TYPE * c2, gnutls_pk_params_st * params) +_gnutls_asn1_encode_rsa(asn1_node * c2, gnutls_pk_params_st * params) { int result, ret; uint8_t null = '\0'; @@ -696,9 +696,9 @@ _gnutls_asn1_encode_rsa(ASN1_TYPE * c2, gnutls_pk_params_st * params) */ /* first make sure that no previously allocated data are leaked */ - if (*c2 != ASN1_TYPE_EMPTY) { + if (*c2 != NULL) { asn1_delete_structure(c2); - *c2 = ASN1_TYPE_EMPTY; + *c2 = NULL; } if ((result = asn1_create_element @@ -803,7 +803,7 @@ _gnutls_asn1_encode_rsa(ASN1_TYPE * c2, gnutls_pk_params_st * params) /* Encodes the ECC parameters into an ASN.1 ECPrivateKey structure. */ static int -_gnutls_asn1_encode_ecc(ASN1_TYPE * c2, gnutls_pk_params_st * params) +_gnutls_asn1_encode_ecc(asn1_node * c2, gnutls_pk_params_st * params) { int ret; uint8_t one = '\x01'; @@ -815,9 +815,9 @@ _gnutls_asn1_encode_ecc(ASN1_TYPE * c2, gnutls_pk_params_st * params) return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); /* first make sure that no previously allocated data are leaked */ - if (*c2 != ASN1_TYPE_EMPTY) { + if (*c2 != NULL) { asn1_delete_structure(c2); - *c2 = ASN1_TYPE_EMPTY; + *c2 = NULL; } if ((ret = asn1_create_element @@ -909,7 +909,7 @@ cleanup: } static int -_gnutls_asn1_encode_gost(ASN1_TYPE * c2, gnutls_pk_params_st * params) +_gnutls_asn1_encode_gost(asn1_node * c2, gnutls_pk_params_st * params) { int ret; const char *oid; @@ -920,9 +920,9 @@ _gnutls_asn1_encode_gost(ASN1_TYPE * c2, gnutls_pk_params_st * params) return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); /* first make sure that no previously allocated data are leaked */ - if (*c2 != ASN1_TYPE_EMPTY) { + if (*c2 != NULL) { asn1_delete_structure(c2); - *c2 = ASN1_TYPE_EMPTY; + *c2 = NULL; } if ((ret = asn1_create_element @@ -952,15 +952,15 @@ cleanup: /* Encodes the DSA parameters into an ASN.1 DSAPrivateKey structure. */ static int -_gnutls_asn1_encode_dsa(ASN1_TYPE * c2, gnutls_pk_params_st * params) +_gnutls_asn1_encode_dsa(asn1_node * c2, gnutls_pk_params_st * params) { int result, ret; const uint8_t null = '\0'; /* first make sure that no previously allocated data are leaked */ - if (*c2 != ASN1_TYPE_EMPTY) { + if (*c2 != NULL) { asn1_delete_structure(c2); - *c2 = ASN1_TYPE_EMPTY; + *c2 = NULL; } if ((result = asn1_create_element @@ -1027,7 +1027,7 @@ cleanup: return ret; } -int _gnutls_asn1_encode_privkey(ASN1_TYPE * c2, +int _gnutls_asn1_encode_privkey(asn1_node * c2, gnutls_pk_params_st * params) { switch (params->algo) { diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c index d68c737570..b26d07dfcb 100644 --- a/lib/x509/krb5.c +++ b/lib/x509/krb5.c @@ -139,7 +139,7 @@ static krb5_principal_data *name_to_principal(const char *_name) int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum_t * der) { int ret, result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; krb5_principal_data *princ; unsigned i; @@ -208,7 +208,7 @@ int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum_t * der) return ret; } -static int principal_to_str(ASN1_TYPE c2, gnutls_buffer_st * str) +static int principal_to_str(asn1_node c2, gnutls_buffer_st * str) { gnutls_datum_t realm = { NULL, 0 }; gnutls_datum_t component = { NULL, 0 }; @@ -292,7 +292,7 @@ int _gnutls_krb5_der_to_principal(const gnutls_datum_t * der, gnutls_datum_t * name) { int ret, result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_buffer_st str; _gnutls_buffer_init(&str); diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c index a0bdfab9f7..c0751df5d0 100644 --- a/lib/x509/mpi.c +++ b/lib/x509/mpi.c @@ -37,7 +37,7 @@ int _gnutls_x509_read_der_int(uint8_t * der, int dersize, bigint_t * out) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; /* == INTEGER */ if ((result = asn1_create_element @@ -72,7 +72,7 @@ int _gnutls_x509_read_der_int(uint8_t * der, int dersize, bigint_t * out) int _gnutls_x509_read_der_uint(uint8_t * der, int dersize, unsigned int *out) { int result; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; /* == INTEGER */ if ((result = asn1_create_element @@ -108,7 +108,7 @@ int _gnutls_x509_read_der_uint(uint8_t * der, int dersize, unsigned int *out) /* Extracts DSA and RSA parameters from a certificate. */ int -_gnutls_get_asn_mpis(ASN1_TYPE asn, const char *root, +_gnutls_get_asn_mpis(asn1_node asn, const char *root, gnutls_pk_params_st * params) { int result; @@ -223,7 +223,7 @@ _gnutls_x509_crq_get_mpis(gnutls_x509_crq_t cert, * This is the "signatureAlgorithm" fields. */ int -_gnutls_x509_read_pkalgo_params(ASN1_TYPE src, const char *src_name, +_gnutls_x509_read_pkalgo_params(asn1_node src, const char *src_name, gnutls_x509_spki_st *spki, unsigned is_sig) { int result; @@ -277,7 +277,7 @@ _gnutls_x509_read_pkalgo_params(ASN1_TYPE src, const char *src_name, return 0; } -static int write_oid_and_params(ASN1_TYPE dst, const char *dst_name, const char *oid, gnutls_x509_spki_st *params) +static int write_oid_and_params(asn1_node dst, const char *dst_name, const char *oid, gnutls_x509_spki_st *params) { int result; char name[128]; @@ -328,7 +328,7 @@ static int write_oid_and_params(ASN1_TYPE dst, const char *dst_name, const char } int -_gnutls_x509_write_spki_params(ASN1_TYPE dst, const char *dst_name, +_gnutls_x509_write_spki_params(asn1_node dst, const char *dst_name, gnutls_x509_spki_st *params) { const char *oid; @@ -352,7 +352,7 @@ _gnutls_x509_write_spki_params(ASN1_TYPE dst, const char *dst_name, } int -_gnutls_x509_write_sign_params(ASN1_TYPE dst, const char *dst_name, +_gnutls_x509_write_sign_params(asn1_node dst, const char *dst_name, const gnutls_sign_entry_st *se, gnutls_x509_spki_st *params) { const char *oid; @@ -380,7 +380,7 @@ _gnutls_x509_write_sign_params(ASN1_TYPE dst, const char *dst_name, * steps. */ int -_gnutls_x509_read_uint(ASN1_TYPE node, const char *value, +_gnutls_x509_read_uint(asn1_node node, const char *value, unsigned int *ret) { int len, result; @@ -428,7 +428,7 @@ _gnutls_x509_read_uint(ASN1_TYPE node, const char *value, /* Writes the specified integer into the specified node. */ int -_gnutls_x509_write_uint32(ASN1_TYPE node, const char *value, uint32_t num) +_gnutls_x509_write_uint32(asn1_node node, const char *value, uint32_t num) { uint8_t tmpstr[5]; int result; diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c index b93527ee54..9b71853c6d 100644 --- a/lib/x509/name_constraints.c +++ b/lib/x509/name_constraints.c @@ -111,7 +111,7 @@ static int validate_name_constraints_node(gnutls_x509_subject_alt_name_t type, return GNUTLS_E_SUCCESS; } -int _gnutls_extract_name_constraints(ASN1_TYPE c2, const char *vstr, +int _gnutls_extract_name_constraints(asn1_node c2, const char *vstr, name_constraints_node_st ** _nc) { int ret; diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c index e750ac4724..b8646d3dc1 100644 --- a/lib/x509/ocsp.c +++ b/lib/x509/ocsp.c @@ -41,14 +41,14 @@ #include "intprops.h" typedef struct gnutls_ocsp_req_int { - ASN1_TYPE req; + asn1_node req; unsigned init; } gnutls_ocsp_req_int; typedef struct gnutls_ocsp_resp_int { - ASN1_TYPE resp; + asn1_node resp; gnutls_datum_t response_type_oid; - ASN1_TYPE basicresp; + asn1_node basicresp; gnutls_datum_t der; unsigned init; } gnutls_ocsp_resp_int; diff --git a/lib/x509/output.c b/lib/x509/output.c index b669b86b22..70210847b8 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -898,7 +898,7 @@ static void print_subject_sign_tool(gnutls_buffer_st * str, const char *prefix, static void print_issuer_sign_tool(gnutls_buffer_st * str, const char *prefix, const gnutls_datum_t *der) { int ret; - ASN1_TYPE tmpasn = ASN1_TYPE_EMPTY; + asn1_node tmpasn = NULL; char asn1_err[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = ""; gnutls_datum_t tmp; diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index 965de6fe02..8ab58d673b 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -41,14 +41,14 @@ /* Decodes the PKCS #12 auth_safe, and returns the allocated raw data, - * which holds them. Returns an ASN1_TYPE of authenticatedSafe. + * which holds them. Returns an asn1_node of authenticatedSafe. */ static int -_decode_pkcs12_auth_safe(ASN1_TYPE pkcs12, ASN1_TYPE * authen_safe, +_decode_pkcs12_auth_safe(asn1_node pkcs12, asn1_node * authen_safe, gnutls_datum_t * raw) { char oid[MAX_OID_SIZE]; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_datum_t auth_safe = { NULL, 0 }; int len, result; char error_str[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; @@ -367,7 +367,7 @@ _pkcs12_decode_safe_contents(const gnutls_datum_t * content, gnutls_pkcs12_bag_t bag) { char oid[MAX_OID_SIZE], root[MAX_NAME_SIZE]; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int len, result; int bag_type; gnutls_datum_t attr_val; @@ -549,7 +549,7 @@ _pkcs12_decode_safe_contents(const gnutls_datum_t * content, static int -_parse_safe_contents(ASN1_TYPE sc, const char *sc_name, +_parse_safe_contents(asn1_node sc, const char *sc_name, gnutls_pkcs12_bag_t bag) { gnutls_datum_t content = { NULL, 0 }; @@ -600,7 +600,7 @@ int gnutls_pkcs12_get_bag(gnutls_pkcs12_t pkcs12, int indx, gnutls_pkcs12_bag_t bag) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result, len; char root2[MAX_NAME_SIZE]; char oid[MAX_OID_SIZE]; @@ -668,11 +668,11 @@ gnutls_pkcs12_get_bag(gnutls_pkcs12_t pkcs12, /* Creates an empty PFX structure for the PKCS12 structure. */ -static int create_empty_pfx(ASN1_TYPE pkcs12) +static int create_empty_pfx(asn1_node pkcs12) { uint8_t three = 3; int result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; /* Use version 3 */ @@ -734,8 +734,8 @@ static int create_empty_pfx(ASN1_TYPE pkcs12) **/ int gnutls_pkcs12_set_bag(gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; - ASN1_TYPE safe_cont = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; + asn1_node safe_cont = NULL; int result; int enc = 0, dum = 1; char null; @@ -1213,7 +1213,7 @@ pkcs12_try_gost: static int write_attributes(gnutls_pkcs12_bag_t bag, int elem, - ASN1_TYPE c2, const char *where) + asn1_node c2, const char *where) { int result; char root[128]; @@ -1316,10 +1316,10 @@ write_attributes(gnutls_pkcs12_bag_t bag, int elem, * the given datum. Enc is set to non-zero if the data are encrypted; */ int -_pkcs12_encode_safe_contents(gnutls_pkcs12_bag_t bag, ASN1_TYPE * contents, +_pkcs12_encode_safe_contents(gnutls_pkcs12_bag_t bag, asn1_node * contents, int *enc) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result; unsigned i; const char *oid; diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c index 163b0fadb6..51a506e01e 100644 --- a/lib/x509/pkcs12_bag.c +++ b/lib/x509/pkcs12_bag.c @@ -165,7 +165,7 @@ _pkcs12_decode_crt_bag(gnutls_pkcs12_bag_type_t type, const gnutls_datum_t * in, gnutls_datum_t * out) { int ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; switch (type) { case GNUTLS_BAG_CERTIFICATE: @@ -266,7 +266,7 @@ _pkcs12_encode_crt_bag(gnutls_pkcs12_bag_type_t type, const gnutls_datum_t * raw, gnutls_datum_t * out) { int ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; switch (type) { case GNUTLS_BAG_CERTIFICATE: @@ -716,7 +716,7 @@ gnutls_pkcs12_bag_encrypt(gnutls_pkcs12_bag_t bag, const char *pass, unsigned int flags) { int ret; - ASN1_TYPE safe_cont = ASN1_TYPE_EMPTY; + asn1_node safe_cont = NULL; gnutls_datum_t der = { NULL, 0 }; gnutls_datum_t enc = { NULL, 0 }; schema_id id; diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c index edd0bcb77b..7c153c051e 100644 --- a/lib/x509/pkcs7-crypt.c +++ b/lib/x509/pkcs7-crypt.c @@ -327,7 +327,7 @@ _gnutls_pkcs7_decrypt_data(const gnutls_datum_t * data, int result, len; char enc_oid[MAX_OID_SIZE]; gnutls_datum_t tmp; - ASN1_TYPE pasn = ASN1_TYPE_EMPTY, pkcs7_asn = ASN1_TYPE_EMPTY; + asn1_node pasn = NULL, pkcs7_asn = NULL; int params_start, params_end, params_len; struct pbkdf2_params kdf_params; struct pbe_enc_params enc_params; @@ -424,7 +424,7 @@ _gnutls_pkcs7_data_enc_info(const gnutls_datum_t * data, { int result, len; char enc_oid[MAX_OID_SIZE]; - ASN1_TYPE pasn = ASN1_TYPE_EMPTY, pkcs7_asn = ASN1_TYPE_EMPTY; + asn1_node pasn = NULL, pkcs7_asn = NULL; int params_start, params_end, params_len; struct pbe_enc_params enc_params; schema_id schema; @@ -519,7 +519,7 @@ _gnutls_pkcs7_encrypt_data(schema_id schema, int result; gnutls_datum_t key = { NULL, 0 }; gnutls_datum_t tmp = { NULL, 0 }; - ASN1_TYPE pkcs7_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs7_asn = NULL; struct pbkdf2_params kdf_params; struct pbe_enc_params enc_params; const struct pkcs_cipher_schema_st *s; @@ -638,12 +638,12 @@ _gnutls_pkcs7_encrypt_data(schema_id schema, /* Reads the PBKDF2 parameters. */ static int -read_pbkdf2_params(ASN1_TYPE pasn, +read_pbkdf2_params(asn1_node pasn, const gnutls_datum_t * der, struct pbkdf2_params *params) { int params_start, params_end; int params_len, len, result; - ASN1_TYPE pbkdf2_asn = ASN1_TYPE_EMPTY; + asn1_node pbkdf2_asn = NULL; char oid[MAX_OID_SIZE]; memset(params, 0, sizeof(*params)); @@ -773,7 +773,7 @@ read_pbkdf2_params(ASN1_TYPE pasn, /* Reads the PBE parameters from PKCS-12 schemas (*&#%*&#% RSA). */ -static int read_pkcs12_kdf_params(ASN1_TYPE pasn, struct pbkdf2_params *params) +static int read_pkcs12_kdf_params(asn1_node pasn, struct pbkdf2_params *params) { int result; @@ -813,7 +813,7 @@ static int read_pkcs12_kdf_params(ASN1_TYPE pasn, struct pbkdf2_params *params) /* Writes the PBE parameters for PKCS-12 schemas. */ static int -write_pkcs12_kdf_params(ASN1_TYPE pasn, const struct pbkdf2_params *kdf_params) +write_pkcs12_kdf_params(asn1_node pasn, const struct pbkdf2_params *kdf_params) { int result; @@ -851,7 +851,7 @@ static int read_pbes2_gost_oid(uint8_t *der, size_t len, char *oid, int oid_size) { int result; - ASN1_TYPE pbe_asn = ASN1_TYPE_EMPTY; + asn1_node pbe_asn = NULL; if ((result = asn1_create_element(_gnutls_get_pkix(), @@ -884,12 +884,12 @@ read_pbes2_gost_oid(uint8_t *der, size_t len, char *oid, int oid_size) } static int -read_pbes2_enc_params(ASN1_TYPE pasn, +read_pbes2_enc_params(asn1_node pasn, const gnutls_datum_t * der, struct pbe_enc_params *params) { int params_start, params_end; int params_len, len, result; - ASN1_TYPE pbe_asn = ASN1_TYPE_EMPTY; + asn1_node pbe_asn = NULL; const struct pkcs_cipher_schema_st *p; memset(params, 0, sizeof(*params)); @@ -983,7 +983,7 @@ _gnutls_read_pkcs_schema_params(schema_id * schema, const char *password, struct pbkdf2_params *kdf_params, struct pbe_enc_params *enc_params) { - ASN1_TYPE pasn = ASN1_TYPE_EMPTY; + asn1_node pasn = NULL; int result; gnutls_datum_t tmp; const struct pkcs_cipher_schema_st *p; @@ -1121,7 +1121,7 @@ _gnutls_pbes2_string_to_key(unsigned int pass_len, const char *password, } int -_gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, +_gnutls_pkcs_raw_decrypt_data(schema_id schema, asn1_node pkcs8_asn, const char *root, const char *_password, const struct pbkdf2_params *kdf_params, const struct pbe_enc_params *enc_params, @@ -1302,10 +1302,10 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, /* Writes the PBKDF2 parameters. */ static int -write_pbkdf2_params(ASN1_TYPE pasn, const struct pbkdf2_params *kdf_params) +write_pbkdf2_params(asn1_node pasn, const struct pbkdf2_params *kdf_params) { int result; - ASN1_TYPE pbkdf2_asn = ASN1_TYPE_EMPTY; + asn1_node pbkdf2_asn = NULL; uint8_t tmp[MAX_OID_SIZE]; const mac_entry_st *me; @@ -1413,10 +1413,10 @@ write_pbkdf2_params(ASN1_TYPE pasn, const struct pbkdf2_params *kdf_params) } static int -write_pbes2_enc_params(ASN1_TYPE pasn, const struct pbe_enc_params *params) +write_pbes2_enc_params(asn1_node pasn, const struct pbe_enc_params *params) { int result; - ASN1_TYPE pbe_asn = ASN1_TYPE_EMPTY; + asn1_node pbe_asn = NULL; const struct pkcs_cipher_schema_st *p; const char *cipher_oid; @@ -1640,13 +1640,13 @@ _gnutls_pkcs_generate_key(schema_id schema, * part. */ int -_gnutls_pkcs_write_schema_params(schema_id schema, ASN1_TYPE pkcs8_asn, +_gnutls_pkcs_write_schema_params(schema_id schema, asn1_node pkcs8_asn, const char *where, const struct pbkdf2_params *kdf_params, const struct pbe_enc_params *enc_params) { int result; - ASN1_TYPE pasn = ASN1_TYPE_EMPTY; + asn1_node pasn = NULL; const struct pkcs_cipher_schema_st *p; p = _gnutls_pkcs_schema_get(schema); diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c index 0ff55ba04b..e930b4dd71 100644 --- a/lib/x509/pkcs7.c +++ b/lib/x509/pkcs7.c @@ -42,13 +42,13 @@ static const uint8_t one = 1; -/* Decodes the PKCS #7 signed data, and returns an ASN1_TYPE, +/* Decodes the PKCS #7 signed data, and returns an asn1_node, * which holds them. If raw is non null then the raw decoded * data are copied (they are locally allocated) there. */ static int _decode_pkcs7_signed_data(gnutls_pkcs7_t pkcs7) { - ASN1_TYPE c2; + asn1_node c2; int len, result; gnutls_datum_t tmp = {NULL, 0}; @@ -477,7 +477,7 @@ void gnutls_pkcs7_signature_info_deinit(gnutls_pkcs7_signature_info_st * info) static time_t parse_time(gnutls_pkcs7_t pkcs7, const char *root) { char tval[128]; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; time_t ret; int result, len; @@ -1484,7 +1484,7 @@ static int reencode(gnutls_pkcs7_t pkcs7) { int result; - if (pkcs7->signed_data != ASN1_TYPE_EMPTY) { + if (pkcs7->signed_data != NULL) { disable_opt_fields(pkcs7); /* Replace the old content with the new @@ -1581,11 +1581,11 @@ gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7, /* Creates an empty signed data structure in the pkcs7 * structure and returns a handle to the signed data. */ -static int create_empty_signed_data(ASN1_TYPE pkcs7, ASN1_TYPE * sdata) +static int create_empty_signed_data(asn1_node pkcs7, asn1_node * sdata) { int result; - *sdata = ASN1_TYPE_EMPTY; + *sdata = NULL; if ((result = asn1_create_element (_gnutls_get_pkix(), "PKIX1.pkcs-7-SignedData", @@ -1662,7 +1662,7 @@ int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt) /* If the signed data are uninitialized * then create them. */ - if (pkcs7->signed_data == ASN1_TYPE_EMPTY) { + if (pkcs7->signed_data == NULL) { /* The pkcs7 structure is new, so create the * signedData. */ @@ -1937,7 +1937,7 @@ int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crl) /* If the signed data are uninitialized * then create them. */ - if (pkcs7->signed_data == ASN1_TYPE_EMPTY) { + if (pkcs7->signed_data == NULL) { /* The pkcs7 structure is new, so create the * signedData. */ @@ -2048,7 +2048,7 @@ int gnutls_pkcs7_delete_crl(gnutls_pkcs7_t pkcs7, int indx) return result; } -static int write_signer_id(ASN1_TYPE c2, const char *root, +static int write_signer_id(asn1_node c2, const char *root, gnutls_x509_crt_t signer, unsigned flags) { int result; @@ -2122,7 +2122,7 @@ static int write_signer_id(ASN1_TYPE c2, const char *root, return 0; } -static int add_attrs(ASN1_TYPE c2, const char *root, gnutls_pkcs7_attrs_t attrs, +static int add_attrs(asn1_node c2, const char *root, gnutls_pkcs7_attrs_t attrs, unsigned already_set) { char name[256]; @@ -2172,7 +2172,7 @@ static int add_attrs(ASN1_TYPE c2, const char *root, gnutls_pkcs7_attrs_t attrs, return 0; } -static int write_attributes(ASN1_TYPE c2, const char *root, +static int write_attributes(asn1_node c2, const char *root, const gnutls_datum_t * data, const mac_entry_st * me, gnutls_pkcs7_attrs_t other_attrs, unsigned flags) @@ -2348,7 +2348,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7, if (pkcs7 == NULL || me == NULL) return GNUTLS_E_INVALID_REQUEST; - if (pkcs7->signed_data == ASN1_TYPE_EMPTY) { + if (pkcs7->signed_data == NULL) { result = asn1_create_element(_gnutls_get_pkix(), "PKIX1.pkcs-7-SignedData", diff --git a/lib/x509/pkcs7_int.h b/lib/x509/pkcs7_int.h index 46c7b62fb5..3d57124693 100644 --- a/lib/x509/pkcs7_int.h +++ b/lib/x509/pkcs7_int.h @@ -86,7 +86,7 @@ _gnutls_decrypt_pbes1_des_md5_data(const char *password, int _gnutls_check_pkcs_cipher_schema(const char *oid); int -_gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, +_gnutls_pkcs_raw_decrypt_data(schema_id schema, asn1_node pkcs8_asn, const char *root, const char *password, const struct pbkdf2_params *kdf_params, const struct pbe_enc_params *enc_params, @@ -111,7 +111,7 @@ _gnutls_read_pkcs_schema_params(schema_id * schema, const char *password, struct pbe_enc_params *enc_params); int -_gnutls_pkcs_write_schema_params(schema_id schema, ASN1_TYPE pkcs8_asn, +_gnutls_pkcs_write_schema_params(schema_id schema, asn1_node pkcs8_asn, const char *where, const struct pbkdf2_params *kdf_params, const struct pbe_enc_params *enc_params); diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 1b3be77b89..0cc1c8b30c 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -52,7 +52,7 @@ int gnutls_x509_privkey_init(gnutls_x509_privkey_t * key) *key = gnutls_calloc(1, sizeof(gnutls_x509_privkey_int)); if (*key) { - (*key)->key = ASN1_TYPE_EMPTY; + (*key)->key = NULL; return 0; /* success */ } @@ -68,7 +68,7 @@ void _gnutls_x509_privkey_reinit(gnutls_x509_privkey_t key) if (key->key) asn1_delete_structure2(&key->key, ASN1_DELETE_FLAG_ZEROIZE); - key->key = ASN1_TYPE_EMPTY; + key->key = NULL; } /** @@ -126,12 +126,12 @@ gnutls_x509_privkey_cpy(gnutls_x509_privkey_t dst, /* Converts an RSA PKCS#1 key to * an internal structure (gnutls_private_key) */ -ASN1_TYPE +asn1_node _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey) { int result; - ASN1_TYPE pkey_asn; + asn1_node pkey_asn; gnutls_pk_params_init(&pkey->params); @@ -223,7 +223,7 @@ _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * raw_key, * an internal structure (gnutls_private_key) */ int -_gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_key, +_gnutls_privkey_decode_ecc_key(asn1_node* pkey_asn, const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey, gnutls_ecc_curve_t curve) { int ret; @@ -336,11 +336,11 @@ _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_k } -static ASN1_TYPE +static asn1_node decode_dsa_key(const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey) { int result; - ASN1_TYPE dsa_asn; + asn1_node dsa_asn; gnutls_datum_t seed = {NULL,0}; char oid[MAX_OID_SIZE]; int oid_size; diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c index 4ffb219759..c54ad4a8b2 100644 --- a/lib/x509/privkey_pkcs8.c +++ b/lib/x509/privkey_pkcs8.c @@ -39,7 +39,7 @@ #include "attributes.h" #include "prov-seed.h" -static int _decode_pkcs8_ecc_key(ASN1_TYPE pkcs8_asn, +static int _decode_pkcs8_ecc_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey); static int pkcs8_key_info(const gnutls_datum_t * raw_key, @@ -64,7 +64,7 @@ inline static int _encode_privkey(gnutls_x509_privkey_t pkey, gnutls_datum_t * raw) { int ret; - ASN1_TYPE spk = ASN1_TYPE_EMPTY; + asn1_node spk = NULL; switch (pkey->params.algo) { case GNUTLS_PK_EDDSA_ED25519: @@ -159,11 +159,11 @@ _encode_privkey(gnutls_x509_privkey_t pkey, gnutls_datum_t * raw) /* * Encodes a PKCS #1 private key to a PKCS #8 private key * info. The output will be allocated and stored into der. Also - * the ASN1_TYPE of private key info will be returned. + * the asn1_node of private key info will be returned. */ static int encode_to_private_key_info(gnutls_x509_privkey_t pkey, - gnutls_datum_t * der, ASN1_TYPE * pkey_info) + gnutls_datum_t * der, asn1_node * pkey_info) { int result, len; uint8_t null = 0; @@ -313,12 +313,12 @@ encode_to_private_key_info(gnutls_x509_privkey_t pkey, */ static int encode_to_pkcs8_key(schema_id schema, const gnutls_datum_t * der_key, - const char *password, ASN1_TYPE * out) + const char *password, asn1_node * out) { int result; gnutls_datum_t key = { NULL, 0 }; gnutls_datum_t tmp = { NULL, 0 }; - ASN1_TYPE pkcs8_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs8_asn = NULL; struct pbkdf2_params kdf_params; struct pbe_enc_params enc_params; const struct pkcs_cipher_schema_st *s; @@ -439,7 +439,7 @@ gnutls_x509_privkey_export_pkcs8(gnutls_x509_privkey_t key, void *output_data, size_t * output_data_size) { - ASN1_TYPE pkcs8_asn = NULL, pkey_info; + asn1_node pkcs8_asn = NULL, pkey_info; int ret; gnutls_datum_t tmp = {NULL, 0}; schema_id schema; @@ -640,7 +640,7 @@ gnutls_x509_privkey_export2_pkcs8(gnutls_x509_privkey_t key, const char *password, unsigned int flags, gnutls_datum_t * out) { - ASN1_TYPE pkcs8_asn = NULL, pkey_info; + asn1_node pkcs8_asn = NULL, pkey_info; int ret; gnutls_datum_t tmp = {NULL, 0}; schema_id schema; @@ -715,7 +715,7 @@ gnutls_x509_privkey_export2_pkcs8(gnutls_x509_privkey_t key, } static int pkcs8_key_decrypt(const gnutls_datum_t * raw_key, - ASN1_TYPE pkcs8_asn, const char *password, + asn1_node pkcs8_asn, const char *password, gnutls_x509_privkey_t pkey) { int result, len; @@ -798,7 +798,7 @@ static int pkcs8_key_decrypt(const gnutls_datum_t * raw_key, static int check_for_decrypted(const gnutls_datum_t *der) { int result; - ASN1_TYPE pkcs8_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs8_asn = NULL; if ((result = asn1_create_element(_gnutls_get_pkix(), @@ -833,7 +833,7 @@ int pkcs8_key_info(const gnutls_datum_t * raw_key, int params_start, params_end, params_len; struct pbe_enc_params enc_params; schema_id schema; - ASN1_TYPE pkcs8_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs8_asn = NULL; memset(&enc_params, 0, sizeof(enc_params)); @@ -934,7 +934,7 @@ pkcs8_key_decode(const gnutls_datum_t * raw_key, unsigned int decrypt) { int result; - ASN1_TYPE pkcs8_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs8_asn = NULL; if ((result = asn1_create_element(_gnutls_get_pkix(), @@ -969,7 +969,7 @@ pkcs8_key_decode(const gnutls_datum_t * raw_key, /* Decodes an RSA privateKey from a PKCS8 structure. */ static int -_decode_pkcs8_rsa_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) +_decode_pkcs8_rsa_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey) { int ret; gnutls_datum_t tmp = {NULL, 0}; @@ -998,7 +998,7 @@ _decode_pkcs8_rsa_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) /* Decodes an RSA-PSS privateKey from a PKCS8 structure. */ static int -_decode_pkcs8_rsa_pss_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) +_decode_pkcs8_rsa_pss_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey) { int ret; gnutls_datum_t tmp = {NULL, 0}; @@ -1043,7 +1043,7 @@ _decode_pkcs8_rsa_pss_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) /* Decodes an ECC privateKey from a PKCS8 structure. */ static int -_decode_pkcs8_ecc_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) +_decode_pkcs8_ecc_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey) { int ret; gnutls_datum_t tmp = {NULL, 0}; @@ -1087,7 +1087,7 @@ _decode_pkcs8_ecc_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) } static int -_decode_pkcs8_eddsa_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey, const char *oid) +_decode_pkcs8_eddsa_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey, const char *oid) { int ret; gnutls_datum_t tmp; @@ -1164,7 +1164,7 @@ _privkey_decode_gost_key(const gnutls_datum_t * raw_key, goto error; } } else if (raw_key->data[0] == ASN1_TAG_INTEGER) { - ASN1_TYPE pkey_asn; + asn1_node pkey_asn; /* Very old format: INTEGER packed in OCTET STRING */ if ((ret = asn1_create_element(_gnutls_get_gnutls_asn(), @@ -1194,7 +1194,7 @@ _privkey_decode_gost_key(const gnutls_datum_t * raw_key, } asn1_delete_structure2(&pkey_asn, ASN1_DELETE_FLAG_ZEROIZE); } else if (raw_key->data[0] == ASN1_TAG_OCTET_STRING) { - ASN1_TYPE pkey_asn; + asn1_node pkey_asn; /* format: OCTET STRING packed in OCTET STRING */ if ((ret = asn1_create_element(_gnutls_get_gnutls_asn(), @@ -1241,7 +1241,7 @@ _privkey_decode_gost_key(const gnutls_datum_t * raw_key, /* Decodes a GOST privateKey from a PKCS8 structure. */ static int -_decode_pkcs8_gost_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey, +_decode_pkcs8_gost_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey, gnutls_pk_algorithm_t algo) { int ret; @@ -1312,7 +1312,7 @@ error: /* Decodes an DSA privateKey and params from a PKCS8 structure. */ static int -_decode_pkcs8_dsa_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey) +_decode_pkcs8_dsa_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey) { int ret; gnutls_datum_t tmp = {NULL, 0}; @@ -1399,7 +1399,7 @@ decode_private_key_info(const gnutls_datum_t * der, { int result, len; char oid[MAX_OID_SIZE]; - ASN1_TYPE pkcs8_asn = ASN1_TYPE_EMPTY; + asn1_node pkcs8_asn = NULL; gnutls_datum_t sder; int ret; diff --git a/lib/x509/privkey_pkcs8_pbes1.c b/lib/x509/privkey_pkcs8_pbes1.c index 7d977a3350..70217dac47 100644 --- a/lib/x509/privkey_pkcs8_pbes1.c +++ b/lib/x509/privkey_pkcs8_pbes1.c @@ -41,7 +41,7 @@ int _gnutls_read_pbkdf1_params(const uint8_t * data, int data_size, struct pbkdf2_params *kdf_params, struct pbe_enc_params *enc_params) { - ASN1_TYPE pasn = ASN1_TYPE_EMPTY; + asn1_node pasn = NULL; int len; int ret, result; diff --git a/lib/x509/prov-seed.c b/lib/x509/prov-seed.c index 5ce17a7dfa..d0119b4342 100644 --- a/lib/x509/prov-seed.c +++ b/lib/x509/prov-seed.c @@ -36,7 +36,7 @@ int _x509_encode_provable_seed(gnutls_x509_privkey_t pkey, gnutls_datum_t *der) { - ASN1_TYPE c2; + asn1_node c2; int ret, result; const char *oid; @@ -85,7 +85,7 @@ int _x509_encode_provable_seed(gnutls_x509_privkey_t pkey, gnutls_datum_t *der) int _x509_decode_provable_seed(gnutls_x509_privkey_t pkey, const gnutls_datum_t *der) { - ASN1_TYPE c2; + asn1_node c2; int ret, result; char oid[MAX_OID_SIZE]; int oid_size; diff --git a/lib/x509/sign.c b/lib/x509/sign.c index 461524f5bf..303e9f2f91 100644 --- a/lib/x509/sign.c +++ b/lib/x509/sign.c @@ -39,11 +39,11 @@ #include <pk.h> /* This is the same as the _gnutls_x509_sign, but this one will decode - * the ASN1_TYPE given, and sign the DER data. Actually used to get the DER + * the asn1_node given, and sign the DER data. Actually used to get the DER * of the TBS and sign it on the fly. */ int -_gnutls_x509_get_tbs(ASN1_TYPE cert, const char *tbs_name, +_gnutls_x509_get_tbs(asn1_node cert, const char *tbs_name, gnutls_datum_t * tbs) { return _gnutls_x509_der_encode(cert, tbs_name, tbs, 0); @@ -88,7 +88,7 @@ _gnutls_x509_crt_get_spki_params(gnutls_x509_crt_t crt, /*- * _gnutls_x509_pkix_sign - This function will sign a CRL or a certificate with a key - * @src: should contain an ASN1_TYPE + * @src: should contain an asn1_node * @issuer: is the certificate of the certificate issuer * @issuer_key: holds the issuer's private key * @@ -99,7 +99,7 @@ _gnutls_x509_crt_get_spki_params(gnutls_x509_crt_t crt, * negative error value. -*/ int -_gnutls_x509_pkix_sign(ASN1_TYPE src, const char *src_name, +_gnutls_x509_pkix_sign(asn1_node src, const char *src_name, gnutls_digest_algorithm_t dig, unsigned int flags, gnutls_x509_crt_t issuer, diff --git a/lib/x509/time.c b/lib/x509/time.c index 421138436a..272660069b 100644 --- a/lib/x509/time.c +++ b/lib/x509/time.c @@ -319,11 +319,11 @@ gtime_to_generalTime(time_t gtime, char *str_time, size_t str_time_size) } -/* Extracts the time in time_t from the ASN1_TYPE given. When should +/* Extracts the time in time_t from the asn1_node given. When should * be something like "tbsCertList.thisUpdate". */ #define MAX_TIME 64 -time_t _gnutls_x509_get_time(ASN1_TYPE c2, const char *where, int force_general) +time_t _gnutls_x509_get_time(asn1_node c2, const char *where, int force_general) { char ttime[MAX_TIME]; char name[128]; @@ -378,11 +378,11 @@ time_t _gnutls_x509_get_time(ASN1_TYPE c2, const char *where, int force_general) return c_time; } -/* Sets the time in time_t in the ASN1_TYPE given. Where should +/* Sets the time in time_t in the asn1_node given. Where should * be something like "tbsCertList.thisUpdate". */ int -_gnutls_x509_set_time(ASN1_TYPE c2, const char *where, time_t tim, +_gnutls_x509_set_time(asn1_node c2, const char *where, time_t tim, int force_general) { char str_time[MAX_TIME]; @@ -438,7 +438,7 @@ _gnutls_x509_set_time(ASN1_TYPE c2, const char *where, time_t tim, * which are of the ANY. */ int -_gnutls_x509_set_raw_time(ASN1_TYPE c2, const char *where, time_t tim) +_gnutls_x509_set_raw_time(asn1_node c2, const char *where, time_t tim) { char str_time[MAX_TIME]; uint8_t buf[128]; diff --git a/lib/x509/verify.c b/lib/x509/verify.c index c4b5f28c64..ac1b268f11 100644 --- a/lib/x509/verify.c +++ b/lib/x509/verify.c @@ -1331,7 +1331,7 @@ cleanup: static int _gnutls_x509_validate_sign_params(gnutls_pk_algorithm_t pk_algorithm, - ASN1_TYPE cert, + asn1_node cert, const char *name, gnutls_x509_spki_st *sig_params) { diff --git a/lib/x509/x509.c b/lib/x509/x509.c index b56f6195b2..257a223699 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -1672,7 +1672,7 @@ gnutls_x509_crt_get_spki(gnutls_x509_crt_t cert, gnutls_x509_spki_t spki, unsign * */ int -_gnutls_parse_general_name2(ASN1_TYPE src, const char *src_name, +_gnutls_parse_general_name2(asn1_node src, const char *src_name, int seq, gnutls_datum_t *dname, unsigned int *ret_type, int othername_oid) { @@ -1793,7 +1793,7 @@ _gnutls_parse_general_name2(ASN1_TYPE src, const char *src_name, * Type is also returned as a parameter in case of an error. */ int -_gnutls_parse_general_name(ASN1_TYPE src, const char *src_name, +_gnutls_parse_general_name(asn1_node src, const char *src_name, int seq, void *name, size_t * name_size, unsigned int *ret_type, int othername_oid) { @@ -3999,7 +3999,7 @@ gnutls_x509_crt_get_issuer_unique_id(gnutls_x509_crt_t crt, char *buf, } static int -legacy_parse_aia(ASN1_TYPE src, +legacy_parse_aia(asn1_node src, unsigned int seq, int what, gnutls_datum_t * data) { int len; @@ -4170,7 +4170,7 @@ gnutls_x509_crt_get_authority_info_access(gnutls_x509_crt_t crt, { int ret; gnutls_datum_t aia; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (crt == NULL) { gnutls_assert(); diff --git a/lib/x509/x509_dn.c b/lib/x509/x509_dn.c index 54e848f714..1dde410d17 100644 --- a/lib/x509/x509_dn.c +++ b/lib/x509/x509_dn.c @@ -559,8 +559,8 @@ int gnutls_x509_dn_get_rdn_ava(gnutls_x509_dn_t dn, int irdn, int iava, gnutls_x509_ava_st * ava) { - ASN1_TYPE rdn, elem; - ASN1_DATA_NODE vnode; + asn1_node rdn, elem; + asn1_data_node_st vnode; long len; int lenlen, remlen, ret; char rbuf[MAX_NAME_SIZE]; diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c index 62cf02ce06..c43bb172c3 100644 --- a/lib/x509/x509_ext.c +++ b/lib/x509/x509_ext.c @@ -221,7 +221,7 @@ int gnutls_x509_ext_import_subject_alt_names(const gnutls_datum_t * ext, gnutls_subject_alt_names_t sans, unsigned int flags) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result, ret; unsigned int i; gnutls_datum_t san, othername_oid; @@ -300,7 +300,7 @@ int gnutls_x509_ext_import_subject_alt_names(const gnutls_datum_t * ext, int gnutls_x509_ext_export_subject_alt_names(gnutls_subject_alt_names_t sans, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result, ret; unsigned i; @@ -371,7 +371,7 @@ int gnutls_x509_ext_import_name_constraints(const gnutls_datum_t * ext, unsigned int flags) { int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_x509_name_constraints_t nc2 = NULL; result = asn1_create_element @@ -466,7 +466,7 @@ int gnutls_x509_ext_export_name_constraints(gnutls_x509_name_constraints_t nc, { int ret, result; uint8_t null = 0; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; struct name_constraints_node_st *tmp; if (nc->permitted == NULL && nc->excluded == NULL) @@ -605,7 +605,7 @@ int gnutls_x509_ext_import_subject_key_id(const gnutls_datum_t * ext, gnutls_datum_t * id) { int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (ext->size == 0 || ext->data == NULL) { gnutls_assert(); @@ -657,7 +657,7 @@ int gnutls_x509_ext_import_subject_key_id(const gnutls_datum_t * ext, int gnutls_x509_ext_export_subject_key_id(const gnutls_datum_t * id, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int ret, result; result = @@ -899,7 +899,7 @@ int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext, { int ret; unsigned i; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_datum_t san, othername_oid; unsigned type; @@ -999,7 +999,7 @@ int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext, int gnutls_x509_ext_export_authority_key_id(gnutls_x509_aki_t aki, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; unsigned i; int result, ret; @@ -1094,7 +1094,7 @@ int gnutls_x509_ext_export_authority_key_id(gnutls_x509_aki_t aki, int gnutls_x509_ext_import_key_usage(const gnutls_datum_t * ext, unsigned int *key_usage) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int len, result; uint8_t str[2]; @@ -1172,7 +1172,7 @@ static int _last_key_usage_set_bit(int usage) **/ int gnutls_x509_ext_export_key_usage(unsigned int usage, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result; uint8_t str[2]; @@ -1254,7 +1254,7 @@ int gnutls_x509_ext_import_inhibit_anypolicy(const gnutls_datum_t * ext, **/ int gnutls_x509_ext_export_inhibit_anypolicy(unsigned int skipcerts, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result, ret; result = asn1_create_element(_gnutls_get_gnutls_asn(), "GNUTLS.DSAPublicKey", &c2); @@ -1303,7 +1303,7 @@ int gnutls_x509_ext_import_private_key_usage_period(const gnutls_datum_t * ext, time_t * expiration) { int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; result = asn1_create_element (_gnutls_get_pkix(), "PKIX1.PrivateKeyUsagePeriod", &c2); @@ -1356,7 +1356,7 @@ int gnutls_x509_ext_export_private_key_usage_period(time_t activation, gnutls_datum_t * ext) { int result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; result = asn1_create_element(_gnutls_get_pkix(), @@ -1408,7 +1408,7 @@ int gnutls_x509_ext_export_private_key_usage_period(time_t activation, int gnutls_x509_ext_import_basic_constraints(const gnutls_datum_t * ext, unsigned int *ca, int *pathlen) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; char str[128]=""; int len, result; @@ -1476,7 +1476,7 @@ int gnutls_x509_ext_import_basic_constraints(const gnutls_datum_t * ext, int gnutls_x509_ext_export_basic_constraints(unsigned int ca, int pathlen, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; const char *str; int result; @@ -1550,7 +1550,7 @@ int gnutls_x509_ext_import_proxy(const gnutls_datum_t *ext, int *pathlen, char **policyLanguage, char **policy, size_t *sizeof_policy) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result; gnutls_datum_t value1 = { NULL, 0 }; gnutls_datum_t value2 = { NULL, 0 }; @@ -1643,7 +1643,7 @@ int gnutls_x509_ext_export_proxy(int pathLenConstraint, const char *policyLangua const char *policy, size_t sizeof_policy, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result; result = asn1_create_element(_gnutls_get_pkix(), @@ -1703,7 +1703,7 @@ int gnutls_x509_ext_export_proxy(int pathLenConstraint, const char *policyLangua static int decode_user_notice(const void *data, size_t size, gnutls_datum_t * txt) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int ret, len; char choice_type[64]; char name[128]; @@ -1920,7 +1920,7 @@ int gnutls_x509_ext_import_policies(const gnutls_datum_t * ext, gnutls_x509_policies_t policies, unsigned int flags) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; char tmpstr[128]; char tmpoid[MAX_OID_SIZE]; gnutls_datum_t tmpd = { NULL, 0 }; @@ -2061,7 +2061,7 @@ static int encode_user_notice(const gnutls_datum_t * txt, gnutls_datum_t * der_data) { int result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if ((result = asn1_create_element(_gnutls_get_pkix(), @@ -2129,7 +2129,7 @@ int gnutls_x509_ext_export_policies(gnutls_x509_policies_t policies, int result; unsigned i, j; gnutls_datum_t der_data = {NULL, 0}, tmpd; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; const char *oid; result = @@ -2433,7 +2433,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, unsigned int flags) { int result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; char name[MAX_NAME_SIZE]; int len, ret; uint8_t reasons[2]; @@ -2536,7 +2536,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, int gnutls_x509_ext_export_crl_dist_points(gnutls_x509_crl_dist_points_t cdp, gnutls_datum_t * ext) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int result; uint8_t reasons[2]; unsigned i; @@ -2809,7 +2809,7 @@ int gnutls_x509_aia_set(gnutls_x509_aia_t aia, } -static int parse_aia(ASN1_TYPE c2, gnutls_x509_aia_t aia) +static int parse_aia(asn1_node c2, gnutls_x509_aia_t aia) { int len; char nptr[MAX_NAME_SIZE]; @@ -2892,7 +2892,7 @@ int gnutls_x509_ext_import_aia(const gnutls_datum_t * ext, unsigned int flags) { int ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (ext->size == 0 || ext->data == NULL) { gnutls_assert(); @@ -2943,7 +2943,7 @@ int gnutls_x509_ext_export_aia(gnutls_x509_aia_t aia, gnutls_datum_t * ext) { int ret, result; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; unsigned int i; ret = asn1_create_element(_gnutls_get_pkix(), @@ -3118,7 +3118,7 @@ int gnutls_x509_ext_import_key_purposes(const gnutls_datum_t * ext, { char tmpstr[MAX_NAME_SIZE]; int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; gnutls_datum_t oid = {NULL, 0}; unsigned i; @@ -3189,7 +3189,7 @@ int gnutls_x509_ext_export_key_purposes(gnutls_x509_key_purposes_t p, gnutls_datum_t * ext) { int result, ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; unsigned i; result = asn1_create_element @@ -3250,7 +3250,7 @@ void gnutls_x509_ext_deinit(gnutls_x509_ext_st *ext) int _gnutls_x509_decode_ext(const gnutls_datum_t *der, gnutls_x509_ext_st *out) { - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; char str_critical[10]; char oid[MAX_OID_SIZE]; int result, len, ret; @@ -3319,7 +3319,7 @@ int _gnutls_x509_decode_ext(const gnutls_datum_t *der, gnutls_x509_ext_st *out) /* flags can be zero or GNUTLS_EXT_FLAG_APPEND */ -static int parse_tlsfeatures(ASN1_TYPE c2, gnutls_x509_tlsfeatures_t f, unsigned flags) +static int parse_tlsfeatures(asn1_node c2, gnutls_x509_tlsfeatures_t f, unsigned flags) { char nptr[MAX_NAME_SIZE]; int result; @@ -3395,7 +3395,7 @@ int gnutls_x509_ext_import_tlsfeatures(const gnutls_datum_t * ext, unsigned int flags) { int ret; - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; if (ext->size == 0 || ext->data == NULL) { gnutls_assert(); @@ -3448,7 +3448,7 @@ int gnutls_x509_ext_export_tlsfeatures(gnutls_x509_tlsfeatures_t f, return GNUTLS_E_INVALID_REQUEST; } - ASN1_TYPE c2 = ASN1_TYPE_EMPTY; + asn1_node c2 = NULL; int ret; unsigned i; diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h index a41cc5827a..acbc185c71 100644 --- a/lib/x509/x509_int.h +++ b/lib/x509/x509_int.h @@ -61,16 +61,16 @@ struct gnutls_x509_crl_iter { /* This is used to optimize reads by gnutls_x509_crl_iter_crt_serial() */ - ASN1_TYPE rcache; + asn1_node rcache; unsigned rcache_idx; }; typedef struct gnutls_x509_crl_int { - ASN1_TYPE crl; + asn1_node crl; unsigned expanded; /* This is used to optimize reads by gnutls_x509_crl_get_crt_serial2() */ - ASN1_TYPE rcache; + asn1_node rcache; unsigned rcache_idx; int use_extensions; @@ -79,11 +79,11 @@ typedef struct gnutls_x509_crl_int { } gnutls_x509_crl_int; typedef struct gnutls_x509_dn_st { - ASN1_TYPE asn; + asn1_node asn; } gnutls_x509_dn_st; typedef struct gnutls_x509_crt_int { - ASN1_TYPE cert; + asn1_node cert; int use_extensions; unsigned expanded; /* a certificate has been expanded */ unsigned modified; /* the cached values below may no longer be valid */ @@ -112,7 +112,7 @@ typedef struct gnutls_x509_crt_int { #define MODIFIED(crt) crt->modified=1 typedef struct gnutls_x509_crq_int { - ASN1_TYPE crq; + asn1_node crq; } gnutls_x509_crq_int; typedef struct gnutls_pkcs7_attrs_st { @@ -122,12 +122,12 @@ typedef struct gnutls_pkcs7_attrs_st { } gnutls_pkcs7_attrs_st; typedef struct gnutls_pkcs7_int { - ASN1_TYPE pkcs7; + asn1_node pkcs7; char encap_data_oid[MAX_OID_SIZE]; gnutls_datum_t der_signed_data; - ASN1_TYPE signed_data; + asn1_node signed_data; unsigned expanded; } gnutls_pkcs7_int; @@ -148,7 +148,7 @@ typedef struct gnutls_x509_privkey_int { unsigned expanded; unsigned flags; - ASN1_TYPE key; + asn1_node key; struct pin_info_st pin; } gnutls_x509_privkey_int; @@ -162,9 +162,9 @@ int _gnutls_x509_crl_get_raw_issuer_dn(gnutls_x509_crl_t crl, gnutls_datum_t * dn); /* sign.c */ -int _gnutls_x509_get_tbs(ASN1_TYPE cert, const char *tbs_name, +int _gnutls_x509_get_tbs(asn1_node cert, const char *tbs_name, gnutls_datum_t * tbs); -int _gnutls_x509_pkix_sign(ASN1_TYPE src, const char *src_name, +int _gnutls_x509_pkix_sign(asn1_node src, const char *src_name, gnutls_digest_algorithm_t, unsigned int flags, gnutls_x509_crt_t issuer, @@ -186,49 +186,49 @@ int _gnutls_x509_crt_get_spki_params(gnutls_x509_crt_t issuer, #define OID_LDAP_UID "0.9.2342.19200300.100.1.1" #define OID_PKCS9_EMAIL "1.2.840.113549.1.9.1" -int _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, +int _gnutls_x509_parse_dn(asn1_node asn1_struct, const char *asn1_rdn_name, char *buf, size_t * sizeof_buf, unsigned flags); int -_gnutls_x509_get_dn(ASN1_TYPE asn1_struct, +_gnutls_x509_get_dn(asn1_node asn1_struct, const char *asn1_rdn_name, gnutls_datum_t * dn, unsigned flags); int -_gnutls_x509_parse_dn_oid(ASN1_TYPE asn1_struct, +_gnutls_x509_parse_dn_oid(asn1_node asn1_struct, const char *asn1_rdn_name, const char *given_oid, int indx, unsigned int raw_flag, gnutls_datum_t * out); -int _gnutls_x509_set_dn_oid(ASN1_TYPE asn1_struct, +int _gnutls_x509_set_dn_oid(asn1_node asn1_struct, const char *asn1_rdn_name, const char *oid, int raw_flag, const char *name, int sizeof_name); -int _gnutls_x509_get_dn_oid(ASN1_TYPE asn1_struct, +int _gnutls_x509_get_dn_oid(asn1_node asn1_struct, const char *asn1_rdn_name, int indx, void *_oid, size_t * sizeof_oid); int _gnutls_encode_othername_data(unsigned flags, const void *data, unsigned data_size, gnutls_datum_t *output); -int _gnutls_parse_general_name(ASN1_TYPE src, const char *src_name, +int _gnutls_parse_general_name(asn1_node src, const char *src_name, int seq, void *name, size_t * name_size, unsigned int *ret_type, int othername_oid); int -_gnutls_parse_general_name2(ASN1_TYPE src, const char *src_name, +_gnutls_parse_general_name2(asn1_node src, const char *src_name, int seq, gnutls_datum_t *dname, unsigned int *ret_type, int othername_oid); int -_gnutls_write_new_general_name(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_new_general_name(asn1_node ext, const char *ext_name, gnutls_x509_subject_alt_name_t type, const void *data, unsigned int data_size); int -_gnutls_write_new_othername(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_new_othername(asn1_node ext, const char *ext_name, const char *oid, const void *data, unsigned int data_size); @@ -248,15 +248,15 @@ _gnutls_x509_verify_algorithm(gnutls_digest_algorithm_t * hash, /* privkey.h */ void _gnutls_x509_privkey_reinit(gnutls_x509_privkey_t key); -ASN1_TYPE _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * +asn1_node _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey); -int _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * +int _gnutls_privkey_decode_ecc_key(asn1_node* pkey_asn, const gnutls_datum_t * raw_key, gnutls_x509_privkey_t pkey, gnutls_ecc_curve_t curve); -int _gnutls_privkey_decode_eddsa_key(ASN1_TYPE* pkey_asn, +int _gnutls_privkey_decode_eddsa_key(asn1_node* pkey_asn, const gnutls_datum_t *raw_key, gnutls_x509_privkey_t pkey, gnutls_ecc_curve_t curve); @@ -270,7 +270,7 @@ _gnutls_x509_read_gost_params(uint8_t * der, int dersize, gnutls_pk_params_st * params, gnutls_pk_algorithm_t algo); -int _gnutls_asn1_encode_privkey(ASN1_TYPE * c2, +int _gnutls_asn1_encode_privkey(asn1_node * c2, gnutls_pk_params_st * params); void _gnutls_x509_privkey_get_spki_params(gnutls_x509_privkey_t key, @@ -320,7 +320,7 @@ _gnutls_x509_ext_gen_number(const uint8_t * number, size_t nr_size, int -_gnutls_write_general_name(ASN1_TYPE ext, const char *ext_name, +_gnutls_write_general_name(asn1_node ext, const char *ext_name, gnutls_x509_subject_alt_name_t type, const void *data, unsigned int data_size); @@ -367,39 +367,39 @@ _gnutls_x509_write_pubkey_params(const gnutls_pk_params_st * params, int _gnutls_x509_write_pubkey(const gnutls_pk_params_st * params, gnutls_datum_t * der); -int _gnutls_x509_read_uint(ASN1_TYPE node, const char *value, +int _gnutls_x509_read_uint(asn1_node node, const char *value, unsigned int *ret); int _gnutls_x509_read_der_int(uint8_t * der, int dersize, bigint_t * out); int _gnutls_x509_read_der_uint(uint8_t * der, int dersize, unsigned int *out); -int _gnutls_x509_read_int(ASN1_TYPE node, const char *value, +int _gnutls_x509_read_int(asn1_node node, const char *value, bigint_t * ret_mpi); -int _gnutls_x509_write_int(ASN1_TYPE node, const char *value, bigint_t mpi, +int _gnutls_x509_write_int(asn1_node node, const char *value, bigint_t mpi, int lz); -int _gnutls_x509_write_uint32(ASN1_TYPE node, const char *value, +int _gnutls_x509_write_uint32(asn1_node node, const char *value, uint32_t num); -int _gnutls_x509_read_key_int(ASN1_TYPE node, const char *value, +int _gnutls_x509_read_key_int(asn1_node node, const char *value, bigint_t * ret_mpi); -int _gnutls_x509_write_key_int(ASN1_TYPE node, const char *value, bigint_t mpi, +int _gnutls_x509_write_key_int(asn1_node node, const char *value, bigint_t mpi, int lz); -int _gnutls_x509_read_key_int_le(ASN1_TYPE node, const char *value, +int _gnutls_x509_read_key_int_le(asn1_node node, const char *value, bigint_t * ret_mpi); -int _gnutls_x509_write_key_int_le(ASN1_TYPE node, const char *value, +int _gnutls_x509_write_key_int_le(asn1_node node, const char *value, bigint_t mpi); -int _gnutls_x509_read_pkalgo_params(ASN1_TYPE src, const char *src_name, +int _gnutls_x509_read_pkalgo_params(asn1_node src, const char *src_name, gnutls_x509_spki_st *params, unsigned is_sig); -int _gnutls_x509_write_sign_params(ASN1_TYPE dst, const char *dst_name, +int _gnutls_x509_write_sign_params(asn1_node dst, const char *dst_name, const gnutls_sign_entry_st *se, gnutls_x509_spki_st *params); #define _gnutls_x509_read_sign_params(src,name,params) _gnutls_x509_read_pkalgo_params(src,name,params,1) #define _gnutls_x509_read_spki_params(src,name,params) _gnutls_x509_read_pkalgo_params(src,name,params,0) -int _gnutls_x509_write_spki_params(ASN1_TYPE dst, const char *dst_name, +int _gnutls_x509_write_spki_params(asn1_node dst, const char *dst_name, gnutls_x509_spki_st *params); inline static int @@ -429,7 +429,7 @@ _gnutls_x509_crq_read_spki_params(gnutls_x509_crq_t crt, #include <gnutls/pkcs12.h> typedef struct gnutls_pkcs12_int { - ASN1_TYPE pkcs12; + asn1_node pkcs12; unsigned expanded; } gnutls_pkcs12_int; @@ -470,7 +470,7 @@ int _pkcs12_decode_safe_contents(const gnutls_datum_t * content, gnutls_pkcs12_bag_t bag); int -_pkcs12_encode_safe_contents(gnutls_pkcs12_bag_t bag, ASN1_TYPE * content, +_pkcs12_encode_safe_contents(gnutls_pkcs12_bag_t bag, asn1_node * content, int *enc); int _pkcs12_decode_crt_bag(gnutls_pkcs12_bag_type_t type, @@ -540,7 +540,7 @@ typedef struct name_constraints_node_st { struct name_constraints_node_st *next; } name_constraints_node_st; -int _gnutls_extract_name_constraints(ASN1_TYPE c2, const char *vstr, +int _gnutls_extract_name_constraints(asn1_node c2, const char *vstr, name_constraints_node_st ** _nc); void _gnutls_name_constraints_node_free (name_constraints_node_st *node); int _gnutls_x509_name_constraints_merge(gnutls_x509_name_constraints_t nc, |