x509, tpm2: use asn1_node instead of deprecated ASN1_TYPE

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/pubkey.c b/lib/pubkey.c
index eba1f5b7b35fe48771430cc3cbbbdfae0ee9b066..a0e5bc94566ab1db09e8acec3e078ad152a02150 100644 (file)
--- a/lib/pubkey.c
+++ b/lib/pubkey.c
@@ -505,7 +505,7 @@ gnutls_pubkey_parse_ecc_ecdh_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;

diff --git a/lib/tpm2.c b/lib/tpm2.c
index 750eadc777eb9a7177392c6bf65b473fb789cc64..1c1b710893642eaa1837e24c11db366ac28d8114 100644 (file)
--- a/lib/tpm2.c
+++ b/lib/tpm2.c
@@ -118,9 +118,9 @@ static int ec_key_info(gnutls_privkey_t key, unsigned int flags, void *_info)
        return -1;
 }
 
-static int decode_data(ASN1_TYPE n, gnutls_datum_t *r)
+static int decode_data(asn1_node n, gnutls_datum_t *r)
 {
-       ASN1_DATA_NODE d;
+       asn1_data_node_st d;
        int lenlen;
        int result;
 
@@ -147,7 +147,7 @@ static int decode_data(ASN1_TYPE n, gnutls_datum_t *r)
 int _gnutls_load_tpm2_key(gnutls_privkey_t pkey, const gnutls_datum_t *fdata)
 {
        gnutls_datum_t asn1, pubdata, privdata;
-       ASN1_TYPE tpmkey = ASN1_TYPE_EMPTY;
+       asn1_node tpmkey = NULL;
        char value_buf[16];
        int value_buflen;
        bool emptyauth = false;

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 78c152a6052fac9b6ceee0df6c1feb5ac0d1ab5c..c22ece9456c2325626fe66d06f16dcab203dcb3d 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1139,7 +1139,7 @@ _decode_pkcs8_eddsa_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey, const c
 }
 
 static int
-_decode_pkcs8_modern_ecdh_key(ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey, const char *oid)
+_decode_pkcs8_modern_ecdh_key(asn1_node pkcs8_asn, gnutls_x509_privkey_t pkey, const char *oid)
 {
        int ret;
        gnutls_datum_t tmp;