diff options
-rw-r--r-- | lib/gnutls_global.c | 2 | ||||
-rw-r--r-- | lib/gnutls_global.h | 4 | ||||
-rw-r--r-- | lib/x509/common.c | 2 | ||||
-rw-r--r-- | lib/x509/crl.c | 8 | ||||
-rw-r--r-- | lib/x509/crq.c | 22 | ||||
-rw-r--r-- | lib/x509/dn.c | 24 | ||||
-rw-r--r-- | lib/x509/extensions.c | 12 | ||||
-rw-r--r-- | lib/x509/pkcs12.c | 8 | ||||
-rw-r--r-- | lib/x509/pkcs7.c | 8 | ||||
-rw-r--r-- | lib/x509/x509.c | 12 |
10 files changed, 51 insertions, 51 deletions
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c index 040da12f79..beb2d4a243 100644 --- a/lib/gnutls_global.c +++ b/lib/gnutls_global.c @@ -234,7 +234,7 @@ gnutls_global_init (void) * This should not deal with files in the final * version. */ - if (asn1_check_version (LIBTASN1_VERSION) == NULL) + if (asn1_check_version (ASN1_VERSION) == NULL) { gnutls_assert (); return GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY; diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h index 21416db080..e53aa22a9a 100644 --- a/lib/gnutls_global.h +++ b/lib/gnutls_global.h @@ -36,8 +36,8 @@ extern ASN1_TYPE _gnutls_gnutls_asn; * prevent warnings, since libtasn1 doesn't * use the const keywork in its functions. */ -#define _gnutls_get_gnutls_asn() ((node_asn*) _gnutls_gnutls_asn) -#define _gnutls_get_pkix() ((node_asn*) _gnutls_pkix1_asn) +#define _gnutls_get_gnutls_asn() ((ASN1_TYPE) _gnutls_gnutls_asn) +#define _gnutls_get_pkix() ((ASN1_TYPE) _gnutls_pkix1_asn) extern gnutls_log_func _gnutls_log_func; extern int _gnutls_log_level; diff --git a/lib/x509/common.c b/lib/x509/common.c index c7cf5a90f5..2bcc66e5ef 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -183,7 +183,7 @@ _gnutls_x509_oid_data2string (const char *oid, void *value, const char *ANAME = NULL; int CHOICE = -1, len = -1, result; ASN1_TYPE tmpasn = ASN1_TYPE_EMPTY; - char asn1_err[MAX_ERROR_DESCRIPTION_SIZE] = ""; + char asn1_err[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = ""; if (value == NULL || value_size <= 0 || res_size == NULL) { diff --git a/lib/x509/crl.c b/lib/x509/crl.c index 8db63122d9..5138f0a465 100644 --- a/lib/x509/crl.c +++ b/lib/x509/crl.c @@ -497,8 +497,8 @@ gnutls_x509_crl_get_crt_serial (gnutls_x509_crl_t crl, int indx, { int result, _serial_size; - char serial_name[MAX_NAME_SIZE]; - char date_name[MAX_NAME_SIZE]; + char serial_name[ASN1_MAX_NAME_SIZE]; + char date_name[ASN1_MAX_NAME_SIZE]; if (crl == NULL) { @@ -925,7 +925,7 @@ gnutls_x509_crl_get_extension_info (gnutls_x509_crl_t crl, int indx, { int result; char str_critical[10]; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; int len; if (!crl) @@ -999,7 +999,7 @@ gnutls_x509_crl_get_extension_data (gnutls_x509_crl_t crl, int indx, void *data, size_t * sizeof_data) { int result, len; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; if (!crl) { diff --git a/lib/x509/crq.c b/lib/x509/crq.c index b5cb7911ad..4ba2a19487 100644 --- a/lib/x509/crq.c +++ b/lib/x509/crq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation + * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation * * Author: Nikos Mavrogiannopoulos * @@ -290,8 +290,8 @@ parse_attribute (ASN1_TYPE asn1_struct, int raw, char *buf, size_t * sizeof_buf) { int k1, result; - char tmpbuffer1[MAX_NAME_SIZE]; - char tmpbuffer3[MAX_NAME_SIZE]; + char tmpbuffer1[ASN1_MAX_NAME_SIZE]; + char tmpbuffer3[ASN1_MAX_NAME_SIZE]; char value[200]; char oid[MAX_OID_SIZE]; int len, printable; @@ -455,7 +455,7 @@ add_attribute (ASN1_TYPE asn, const char *root, const char *attribute_id, const gnutls_datum_t * ext_data) { int result; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; snprintf (name, sizeof (name), "%s", root); @@ -505,7 +505,7 @@ static int overwrite_attribute (ASN1_TYPE asn, const char *root, unsigned int indx, const gnutls_datum_t * ext_data) { - char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; int result; snprintf (name, sizeof (name), "%s.?%u", root, indx); @@ -530,7 +530,7 @@ set_attribute (ASN1_TYPE asn, const char *root, { int result; int k, len; - char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; char extnID[MAX_OID_SIZE]; /* Find the index of the given attribute. @@ -1205,7 +1205,7 @@ gnutls_x509_crq_get_attribute_info (gnutls_x509_crq_t cert, int indx, void *oid, size_t * sizeof_oid) { int result; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; int len; if (!cert) @@ -1261,7 +1261,7 @@ gnutls_x509_crq_get_attribute_data (gnutls_x509_crq_t cert, int indx, void *data, size_t * sizeof_data) { int result, len; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; if (!cert) { @@ -1319,7 +1319,7 @@ gnutls_x509_crq_get_extension_info (gnutls_x509_crq_t cert, int indx, { int result; char str_critical[10]; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; unsigned char extensions[MAX_CRQ_EXTENSIONS_SIZE]; size_t extensions_size = sizeof (extensions); ASN1_TYPE c2; @@ -1426,7 +1426,7 @@ gnutls_x509_crq_get_extension_data (gnutls_x509_crq_t cert, int indx, void *data, size_t * sizeof_data) { int result, len; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; unsigned char extensions[MAX_CRQ_EXTENSIONS_SIZE]; size_t extensions_size = sizeof (extensions); ASN1_TYPE c2; @@ -2023,7 +2023,7 @@ gnutls_x509_crq_get_key_purpose_oid (gnutls_x509_crq_t cert, int indx, void *oid, size_t * sizeof_oid, unsigned int *critical) { - char tmpstr[MAX_NAME_SIZE]; + char tmpstr[ASN1_MAX_NAME_SIZE]; int result, len; gnutls_datum_t prev_data; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; diff --git a/lib/x509/dn.c b/lib/x509/dn.c index 922552a064..914fadb89f 100644 --- a/lib/x509/dn.c +++ b/lib/x509/dn.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation + * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation * * Author: Nikos Mavrogiannopoulos * @@ -92,9 +92,9 @@ _gnutls_x509_parse_dn (ASN1_TYPE asn1_struct, { gnutls_string out_str; int k2, k1, result; - char tmpbuffer1[MAX_NAME_SIZE]; - char tmpbuffer2[MAX_NAME_SIZE]; - char tmpbuffer3[MAX_NAME_SIZE]; + char tmpbuffer1[ASN1_MAX_NAME_SIZE]; + char tmpbuffer2[ASN1_MAX_NAME_SIZE]; + char tmpbuffer3[ASN1_MAX_NAME_SIZE]; opaque value[MAX_STRING_LEN], *value2 = NULL; char *escaped = NULL; const char *ldap_desc; @@ -343,9 +343,9 @@ _gnutls_x509_parse_dn_oid (ASN1_TYPE asn1_struct, void *buf, size_t * sizeof_buf) { int k2, k1, result; - char tmpbuffer1[MAX_NAME_SIZE]; - char tmpbuffer2[MAX_NAME_SIZE]; - char tmpbuffer3[MAX_NAME_SIZE]; + char tmpbuffer1[ASN1_MAX_NAME_SIZE]; + char tmpbuffer2[ASN1_MAX_NAME_SIZE]; + char tmpbuffer3[ASN1_MAX_NAME_SIZE]; opaque value[256]; char oid[MAX_OID_SIZE]; int len, printable; @@ -518,9 +518,9 @@ _gnutls_x509_get_dn_oid (ASN1_TYPE asn1_struct, int indx, void *_oid, size_t * sizeof_oid) { int k2, k1, result; - char tmpbuffer1[MAX_NAME_SIZE]; - char tmpbuffer2[MAX_NAME_SIZE]; - char tmpbuffer3[MAX_NAME_SIZE]; + char tmpbuffer1[ASN1_MAX_NAME_SIZE]; + char tmpbuffer2[ASN1_MAX_NAME_SIZE]; + char tmpbuffer3[ASN1_MAX_NAME_SIZE]; char value[256]; char oid[MAX_OID_SIZE]; int len; @@ -872,7 +872,7 @@ _gnutls_x509_set_dn_oid (ASN1_TYPE asn1_struct, int raw_flag, const char *name, int sizeof_name) { int result; - char tmp[MAX_NAME_SIZE], asn1_rdn_name[MAX_NAME_SIZE]; + char tmp[ASN1_MAX_NAME_SIZE], asn1_rdn_name[ASN1_MAX_NAME_SIZE]; if (sizeof_name == 0 || name == NULL) { @@ -995,7 +995,7 @@ int gnutls_x509_dn_import (gnutls_x509_dn_t odn, const gnutls_datum_t * data) { int result; - char err[MAX_ERROR_DESCRIPTION_SIZE]; + char err[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; ASN1_TYPE dn = odn; result = asn1_der_decoding (&dn, data->data, data->size, err); diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c index d8826ec810..2cf9657aa8 100644 --- a/lib/x509/extensions.c +++ b/lib/x509/extensions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation + * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation * * Author: Nikos Mavrogiannopoulos * @@ -39,7 +39,7 @@ get_extension (ASN1_TYPE asn, const char *root, gnutls_datum_t * ret, unsigned int *_critical) { int k, result, len; - char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; char str[1024]; char str_critical[10]; int critical = 0; @@ -196,7 +196,7 @@ get_extension_oid (ASN1_TYPE asn, const char *root, int indx, void *oid, size_t * sizeof_oid) { int k, result, len; - char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; char str[1024]; char extnID[128]; int indx_counter = 0; @@ -308,7 +308,7 @@ add_extension (ASN1_TYPE asn, const char *root, const char *extension_id, { int result; const char *str; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; snprintf (name, sizeof (name), "%s", root); @@ -372,7 +372,7 @@ static int overwrite_extension (ASN1_TYPE 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]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; const char *str; int result; @@ -416,7 +416,7 @@ set_extension (ASN1_TYPE asn, const char *root, { int result; int k, len; - char name[MAX_NAME_SIZE], name2[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE], name2[ASN1_MAX_NAME_SIZE]; char extnID[128]; /* Find the index of the given extension. diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index fb1e6c034e..a0f8312912 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -51,7 +51,7 @@ _decode_pkcs12_auth_safe (ASN1_TYPE pkcs12, ASN1_TYPE * authen_safe, ASN1_TYPE c2 = ASN1_TYPE_EMPTY; gnutls_datum_t auth_safe = { NULL, 0 }; int tmp_size, len, result; - char error_str[MAX_ERROR_DESCRIPTION_SIZE]; + char error_str[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; len = sizeof (oid) - 1; result = asn1_read_value (pkcs12, "authSafe.contentType", oid, &len); @@ -200,7 +200,7 @@ gnutls_pkcs12_import (gnutls_pkcs12_t pkcs12, { int result = 0, need_free = 0; gnutls_datum_t _data; - char error_str[MAX_ERROR_DESCRIPTION_SIZE]; + char error_str[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; _data.data = data->data; _data.size = data->size; @@ -348,7 +348,7 @@ int _pkcs12_decode_safe_contents (const gnutls_datum_t * content, gnutls_pkcs12_bag_t bag) { - char oid[MAX_OID_SIZE], root[MAX_NAME_SIZE]; + char oid[MAX_OID_SIZE], root[ASN1_MAX_NAME_SIZE]; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int len, result; int bag_type; @@ -589,7 +589,7 @@ gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12, { ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int result, len; - char root2[MAX_NAME_SIZE]; + char root2[ASN1_MAX_NAME_SIZE]; char oid[MAX_OID_SIZE]; if (pkcs12 == NULL) diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c index e324596952..b89ce54dc0 100644 --- a/lib/x509/pkcs7.c +++ b/lib/x509/pkcs7.c @@ -284,7 +284,7 @@ gnutls_pkcs7_get_crt_raw (gnutls_pkcs7_t pkcs7, { ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int result, len; - char root2[MAX_NAME_SIZE]; + char root2[ASN1_MAX_NAME_SIZE]; char oid[MAX_OID_SIZE]; gnutls_datum_t tmp = { NULL, 0 }; @@ -674,7 +674,7 @@ gnutls_pkcs7_delete_crt (gnutls_pkcs7_t pkcs7, int indx) { ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int result; - char root2[MAX_NAME_SIZE]; + char root2[ASN1_MAX_NAME_SIZE]; if (pkcs7 == NULL) return GNUTLS_E_INVALID_REQUEST; @@ -745,7 +745,7 @@ gnutls_pkcs7_get_crl_raw (gnutls_pkcs7_t pkcs7, { ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int result; - char root2[MAX_NAME_SIZE]; + char root2[ASN1_MAX_NAME_SIZE]; gnutls_datum_t tmp = { NULL, 0 }; int start, end; @@ -984,7 +984,7 @@ gnutls_pkcs7_delete_crl (gnutls_pkcs7_t pkcs7, int indx) { ASN1_TYPE c2 = ASN1_TYPE_EMPTY; int result; - char root2[MAX_NAME_SIZE]; + char root2[ASN1_MAX_NAME_SIZE]; if (pkcs7 == NULL) return GNUTLS_E_INVALID_REQUEST; diff --git a/lib/x509/x509.c b/lib/x509/x509.c index e6c16bf1d8..ca8cac5107 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -912,7 +912,7 @@ _gnutls_parse_general_name (ASN1_TYPE src, const char *src_name, unsigned int *ret_type, int othername_oid) { unsigned int len; - char nptr[MAX_NAME_SIZE]; + char nptr[ASN1_MAX_NAME_SIZE]; int result; opaque choice_type[128]; gnutls_x509_subject_alt_name_t type; @@ -1604,7 +1604,7 @@ gnutls_x509_crt_get_extension_info (gnutls_x509_crt_t cert, int indx, { int result; char str_critical[10]; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; int len; if (!cert) @@ -1675,7 +1675,7 @@ gnutls_x509_crt_get_extension_data (gnutls_x509_crt_t cert, int indx, void *data, size_t * sizeof_data) { int result, len; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; if (!cert) { @@ -1869,7 +1869,7 @@ gnutls_x509_dn_get_rdn_ava (gnutls_x509_dn_t dn, ASN1_TYPE rdn, elem; long len; int lenlen, remlen, ret; - char rbuf[MAX_NAME_SIZE]; + char rbuf[ASN1_MAX_NAME_SIZE]; unsigned char cls, *ptr; iava++; @@ -2384,7 +2384,7 @@ gnutls_x509_crt_get_crl_dist_points (gnutls_x509_crt_t cert, int result; gnutls_datum_t dist_points = { NULL, 0 }; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; - char name[MAX_NAME_SIZE]; + char name[ASN1_MAX_NAME_SIZE]; int len; gnutls_x509_subject_alt_name_t type; uint8_t reasons[2]; @@ -2498,7 +2498,7 @@ gnutls_x509_crt_get_key_purpose_oid (gnutls_x509_crt_t cert, int indx, void *oid, size_t * sizeof_oid, unsigned int *critical) { - char tmpstr[MAX_NAME_SIZE]; + char tmpstr[ASN1_MAX_NAME_SIZE]; int result, len; gnutls_datum_t id; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; |