diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-06-06 18:39:18 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-06-06 18:41:23 +0200 |
commit | ff22daeca37be4c3c62e7095649243cb8d7a8454 (patch) | |
tree | 539ac8bda1a598230d520b1deb38694e4d2e80ce | |
parent | e7d0806b33e19a088bbd05dc031b1b8e2446a39b (diff) | |
download | gnutls-ff22daeca37be4c3c62e7095649243cb8d7a8454.tar.gz |
lib: eliminated the use of deprecated variables
-rw-r--r-- | lib/auth/cert.c | 4 | ||||
-rw-r--r-- | lib/ext/server_name.c | 2 | ||||
-rw-r--r-- | lib/x509/common.c | 2 | ||||
-rw-r--r-- | lib/x509/crq.c | 4 | ||||
-rw-r--r-- | lib/x509/key_encode.c | 2 | ||||
-rw-r--r-- | lib/x509/krb5.c | 4 | ||||
-rw-r--r-- | lib/x509/krb5.h | 4 | ||||
-rw-r--r-- | lib/x509/privkey.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/lib/auth/cert.c b/lib/auth/cert.c index 6f9ebe436d..e52acd636b 100644 --- a/lib/auth/cert.c +++ b/lib/auth/cert.c @@ -1983,7 +1983,7 @@ _gnutls_server_select_cert(gnutls_session_t session, && _gnutls_str_array_match(cred->certs[i].names, server_name) != 0) { /* if requested algorithms are also compatible select it */ - gnutls_pk_algorithm pk = + gnutls_pk_algorithm_t pk = gnutls_pubkey_get_pk_algorithm(cred->certs [i].cert_list [0].pubkey, @@ -2017,7 +2017,7 @@ _gnutls_server_select_cert(gnutls_session_t session, session->security_parameters.cert_type); for (i = 0; i < cred->ncerts; i++) { - gnutls_pk_algorithm pk = + gnutls_pk_algorithm_t pk = gnutls_pubkey_get_pk_algorithm(cred->certs[i]. cert_list[0].pubkey, NULL); diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c index 7a8ed7e065..72c1387d3b 100644 --- a/lib/ext/server_name.c +++ b/lib/ext/server_name.c @@ -300,7 +300,7 @@ gnutls_server_name_get(gnutls_session_t session, void *data, char *idn_name = NULL; #endif extension_priv_data_t epriv; - gnutls_datum name; + gnutls_datum_t name; if (session->security_parameters.entity == GNUTLS_CLIENT) { gnutls_assert(); diff --git a/lib/x509/common.c b/lib/x509/common.c index 84d6688e4b..dab7fbb582 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -1184,7 +1184,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 *der, +_gnutls_x509_get_signed_data(ASN1_TYPE src, const gnutls_datum_t *der, const char *src_name, gnutls_datum_t * signed_data) { diff --git a/lib/x509/crq.c b/lib/x509/crq.c index 73ff952f4a..c70f3ce45c 100644 --- a/lib/x509/crq.c +++ b/lib/x509/crq.c @@ -2795,8 +2795,8 @@ gnutls_x509_crq_privkey_sign(gnutls_x509_crq_t crq, gnutls_privkey_t key, **/ int gnutls_x509_crq_verify(gnutls_x509_crq_t crq, unsigned int flags) { - gnutls_datum data = { NULL, 0 }; - gnutls_datum signature = { NULL, 0 }; + gnutls_datum_t data = { NULL, 0 }; + gnutls_datum_t signature = { NULL, 0 }; gnutls_pk_params_st params; gnutls_digest_algorithm_t algo; int ret; diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c index 8ebc9fabc7..7df1026635 100644 --- a/lib/x509/key_encode.c +++ b/lib/x509/key_encode.c @@ -497,7 +497,7 @@ _gnutls_asn1_encode_ecc(ASN1_TYPE * c2, gnutls_pk_params_st * params) { int ret; uint8_t one = '\x01'; - gnutls_datum pubkey = { NULL, 0 }; + gnutls_datum_t pubkey = { NULL, 0 }; const char *oid; oid = gnutls_ecc_curve_get_oid(params->flags); diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c index 49096c1e1a..1021a37914 100644 --- a/lib/x509/krb5.c +++ b/lib/x509/krb5.c @@ -131,7 +131,7 @@ static krb5_principal_data* name_to_principal(const char *_name) return princ; } -int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum * der) +int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum_t * der) { int ret, result; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; @@ -277,7 +277,7 @@ static int principal_to_str(ASN1_TYPE c2, gnutls_buffer_st *str) return ret; } -int _gnutls_krb5_der_to_principal(const gnutls_datum * der, gnutls_datum_t *name) +int _gnutls_krb5_der_to_principal(const gnutls_datum_t * der, gnutls_datum_t *name) { int ret, result; ASN1_TYPE c2 = ASN1_TYPE_EMPTY; diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h index 94d4867ec9..58fb9ff4c2 100644 --- a/lib/x509/krb5.h +++ b/lib/x509/krb5.h @@ -18,5 +18,5 @@ * <http://www.gnu.org/licenses/>. */ -int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum * der); -int _gnutls_krb5_der_to_principal(const gnutls_datum * der, gnutls_datum_t *name); +int _gnutls_krb5_principal_to_der(const char *name, gnutls_datum_t * der); +int _gnutls_krb5_der_to_principal(const gnutls_datum_t * der, gnutls_datum_t *name); diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 1300049e91..9cd57aa524 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -275,7 +275,7 @@ _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_k unsigned int version; char oid[MAX_OID_SIZE]; int oid_size; - gnutls_datum out; + gnutls_datum_t out; gnutls_pk_params_init(&pkey->params); |