diff options
| author | Leonardo Bras <leobras.c@gmail.com> | 2021-05-21 03:11:29 -0300 |
|---|---|---|
| committer | Leonardo Bras <leobras.c@gmail.com> | 2021-05-21 03:13:39 -0300 |
| commit | cee6093e8c16f2e1869812b7a69e4c13f9b5aa67 (patch) | |
| tree | dd6cf2ebbb4a5a9ab21416facc3c0fa15a45218b /lib/global.c | |
| parent | df640cf6670848b7af967b3673b3807ad491b4be (diff) | |
| download | gnutls-cee6093e8c16f2e1869812b7a69e4c13f9b5aa67.tar.gz | |
ASN1 : Remove warnings related to old libtasn1 namings
While compiling gnutls, some warnings related to deprecated names can be
printed, such as:
./../x509/x509_int.h:392:13: warning: 'ASN1_TYPE' macro is deprecated, use 'asn1_node' instead.
392 | int _gnutls_x509_write_key_int_le(ASN1_TYPE node, const char *value,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To avoid that, rename types as show in devel/libtasn1/NEWS (release 3.1):
ASN1_DATA_NODE -> asn1_data_node_st
ASN1_ARRAY_TYPE -> asn1_static_node (was asn1_static_node_t)
ASN1_TYPE -> asn1_node
ASN1_TYPE_EMPTY -> NULL
static_struct_asn -> asn1_static_node_st
node_asn_struct -> asn1_node_st
node_asn -> asn1_node_st
Signed-off-by: Leonardo Bras <leobras.c@gmail.com>
Diffstat (limited to 'lib/global.c')
| -rw-r--r-- | lib/global.c | 10 |
1 files changed, 5 insertions, 5 deletions
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(); |