diff options
| author | Daiki Ueno <ueno@gnu.org> | 2022-06-30 20:57:30 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2022-07-20 14:55:33 +0900 |
| commit | 6b5bbd747864704938fea23e9cb98f3efe142867 (patch) | |
| tree | 8dc8df8ee736ee47af6be0849d59db459ac5da1f | |
| parent | ebfe675f15bfb52d61451e96d0f73d792a2b9a9b (diff) | |
| download | gnutls-6b5bbd747864704938fea23e9cb98f3efe142867.tar.gz | |
x509, tpm2: use asn1_node instead of deprecated ASN1_TYPE
Signed-off-by: Daiki Ueno <ueno@gnu.org>
| -rw-r--r-- | lib/pubkey.c | 2 | ||||
| -rw-r--r-- | lib/tpm2.c | 6 | ||||
| -rw-r--r-- | lib/x509/privkey_pkcs8.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/pubkey.c b/lib/pubkey.c index eba1f5b7b3..a0e5bc9456 100644 --- 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 750eadc777..1c1b710893 100644 --- 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 78c152a605..c22ece9456 100644 --- 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; |