diff options
author | Tom Vrancken <dev@tomvrancken.nl> | 2018-10-11 21:01:25 +0200 |
---|---|---|
committer | Tom Vrancken <dev@tomvrancken.nl> | 2018-10-18 21:39:48 +0200 |
commit | a3ee206c73c87a2a2a8d7425f4881237b784508a (patch) | |
tree | 92a840f5c577e7a9fe99ffc8e1060a517ee5246b | |
parent | d0e05a2859cd3ecdc799c4b949d00669c6c82ddf (diff) | |
download | gnutls-a3ee206c73c87a2a2a8d7425f4881237b784508a.tar.gz |
Renamed _gnutls_auth_info_set() to _gnutls_auth_info_init().
Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>
-rw-r--r-- | lib/auth.c | 2 | ||||
-rw-r--r-- | lib/auth.h | 2 | ||||
-rw-r--r-- | lib/auth/anon.c | 4 | ||||
-rw-r--r-- | lib/auth/anon_ecdh.c | 4 | ||||
-rw-r--r-- | lib/auth/cert.c | 4 | ||||
-rw-r--r-- | lib/auth/dhe.c | 2 | ||||
-rw-r--r-- | lib/auth/dhe_psk.c | 12 | ||||
-rw-r--r-- | lib/auth/ecdhe.c | 2 | ||||
-rw-r--r-- | lib/auth/psk.c | 4 | ||||
-rw-r--r-- | lib/auth/rsa_psk.c | 2 | ||||
-rw-r--r-- | lib/auth/srp_kx.c | 2 | ||||
-rw-r--r-- | lib/ext/pre_shared_key.c | 4 | ||||
-rw-r--r-- | lib/session_pack.c | 8 | ||||
-rw-r--r-- | lib/tls13/certificate.c | 2 |
14 files changed, 27 insertions, 27 deletions
diff --git a/lib/auth.c b/lib/auth.c index 4bdedda38b..91a67c9afa 100644 --- a/lib/auth.c +++ b/lib/auth.c @@ -380,7 +380,7 @@ void _gnutls_free_auth_info(gnutls_session_t session) * info structure to a different type. */ int -_gnutls_auth_info_set(gnutls_session_t session, +_gnutls_auth_info_init(gnutls_session_t session, gnutls_credentials_type_t type, int size, int allow_change) { diff --git a/lib/auth.h b/lib/auth.h index a61acd09ee..2520efe2ef 100644 --- a/lib/auth.h +++ b/lib/auth.h @@ -57,7 +57,7 @@ const void *_gnutls_get_cred(gnutls_session_t session, gnutls_credentials_type_t type); const void *_gnutls_get_kx_cred(gnutls_session_t session, gnutls_kx_algorithm_t algo); -int _gnutls_auth_info_set(gnutls_session_t session, +int _gnutls_auth_info_init(gnutls_session_t session, gnutls_credentials_type_t type, int size, int allow_change); diff --git a/lib/auth/anon.c b/lib/auth/anon.c index 0cfa0efde8..1edfb54400 100644 --- a/lib/auth/anon.c +++ b/lib/auth/anon.c @@ -74,7 +74,7 @@ gen_anon_server_kx(gnutls_session_t session, gnutls_buffer_st * data) } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_ANON, + _gnutls_auth_info_init(session, GNUTLS_CRD_ANON, sizeof(anon_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -113,7 +113,7 @@ proc_anon_server_kx(gnutls_session_t session, uint8_t * data, /* set auth_info */ if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_ANON, + _gnutls_auth_info_init(session, GNUTLS_CRD_ANON, sizeof(anon_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; diff --git a/lib/auth/anon_ecdh.c b/lib/auth/anon_ecdh.c index 7b9a7f65bf..e5265425c1 100644 --- a/lib/auth/anon_ecdh.c +++ b/lib/auth/anon_ecdh.c @@ -74,7 +74,7 @@ gen_anon_ecdh_server_kx(gnutls_session_t session, gnutls_buffer_st * data) } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_ANON, + _gnutls_auth_info_init(session, GNUTLS_CRD_ANON, sizeof(anon_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -120,7 +120,7 @@ proc_anon_ecdh_server_kx(gnutls_session_t session, uint8_t * data, /* set auth_info */ if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_ANON, + _gnutls_auth_info_init(session, GNUTLS_CRD_ANON, sizeof(anon_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; diff --git a/lib/auth/cert.c b/lib/auth/cert.c index c722c0c47f..3c6fe1f4ee 100644 --- a/lib/auth/cert.c +++ b/lib/auth/cert.c @@ -650,7 +650,7 @@ _gnutls_proc_x509_crt(gnutls_session_t session, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -842,7 +842,7 @@ _gnutls_proc_cert_cert_req(gnutls_session_t session, uint8_t * data, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 0)) < 0) { gnutls_assert(); return ret; diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c index cf6c9e53ce..9b5ea196ff 100644 --- a/lib/auth/dhe.c +++ b/lib/auth/dhe.c @@ -96,7 +96,7 @@ gen_dhe_server_kx(gnutls_session_t session, gnutls_buffer_st * data) return GNUTLS_E_INSUFFICIENT_CREDENTIALS; } - if ((ret = _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + if ((ret = _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 1)) < 0) { gnutls_assert(); diff --git a/lib/auth/dhe_psk.c b/lib/auth/dhe_psk.c index cb0c203a91..cb78359ccb 100644 --- a/lib/auth/dhe_psk.c +++ b/lib/auth/dhe_psk.c @@ -199,7 +199,7 @@ gen_dhe_psk_server_kx(gnutls_session_t session, gnutls_buffer_st * data) } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -237,7 +237,7 @@ gen_ecdhe_psk_server_kx(gnutls_session_t session, gnutls_buffer_st * data) gnutls_datum_t hint = {NULL, 0}; if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -290,7 +290,7 @@ proc_dhe_psk_client_kx(gnutls_session_t session, uint8_t * data, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -356,7 +356,7 @@ proc_ecdhe_psk_client_kx(gnutls_session_t session, uint8_t * data, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -439,7 +439,7 @@ proc_dhe_psk_server_kx(gnutls_session_t session, uint8_t * data, /* set auth_info */ if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -479,7 +479,7 @@ proc_ecdhe_psk_server_kx(gnutls_session_t session, uint8_t * data, /* set auth_info */ if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c index 8b55704b28..ef9d822714 100644 --- a/lib/auth/ecdhe.c +++ b/lib/auth/ecdhe.c @@ -491,7 +491,7 @@ gen_ecdhe_server_kx(gnutls_session_t session, gnutls_buffer_st * data) return GNUTLS_E_INSUFFICIENT_CREDENTIALS; } - if ((ret = _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + if ((ret = _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 1)) < 0) { gnutls_assert(); diff --git a/lib/auth/psk.c b/lib/auth/psk.c index 6968bb8057..3733de1e62 100644 --- a/lib/auth/psk.c +++ b/lib/auth/psk.c @@ -204,7 +204,7 @@ _gnutls_proc_psk_client_kx(gnutls_session_t session, uint8_t * data, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; @@ -315,7 +315,7 @@ _gnutls_proc_psk_server_kx(gnutls_session_t session, uint8_t * data, } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c index 5a29f91837..644f2e8b29 100644 --- a/lib/auth/rsa_psk.c +++ b/lib/auth/rsa_psk.c @@ -281,7 +281,7 @@ _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, uint8_t * data, return GNUTLS_E_INSUFFICIENT_CREDENTIALS; } - ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); if (ret < 0) { gnutls_assert(); diff --git a/lib/auth/srp_kx.c b/lib/auth/srp_kx.c index ef0c0e68a9..890a5dedc3 100644 --- a/lib/auth/srp_kx.c +++ b/lib/auth/srp_kx.c @@ -137,7 +137,7 @@ _gnutls_gen_srp_server_kx(gnutls_session_t session, priv = epriv; if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_SRP, + _gnutls_auth_info_init(session, GNUTLS_CRD_SRP, sizeof(srp_server_auth_info_st), 1)) < 0) { gnutls_assert(); diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c index c6bb20c688..7e61d45cb7 100644 --- a/lib/ext/pre_shared_key.c +++ b/lib/ext/pre_shared_key.c @@ -310,7 +310,7 @@ client_send_params(gnutls_session_t session, user_key.size = tkey.size; } - ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); + ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); if (ret < 0) { gnutls_assert(); goto cleanup; @@ -600,7 +600,7 @@ static int server_recv_params(gnutls_session_t session, if (!resuming) { assert(psk.identity.size < sizeof(info->username)); - ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); + ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); if (ret < 0) { gnutls_assert(); goto fail; diff --git a/lib/session_pack.c b/lib/session_pack.c index c5801fb32e..8d8abd9f3a 100644 --- a/lib/session_pack.c +++ b/lib/session_pack.c @@ -494,7 +494,7 @@ unpack_certificate_auth_info(gnutls_session_t session, /* client and server have the same auth_info here */ ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 1); if (ret < 0) { gnutls_assert(); @@ -622,7 +622,7 @@ unpack_srp_auth_info(gnutls_session_t session, gnutls_buffer_st * ps) } ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_SRP, + _gnutls_auth_info_init(session, GNUTLS_CRD_SRP, sizeof(srp_server_auth_info_st), 1); if (ret < 0) { gnutls_assert(); @@ -704,7 +704,7 @@ unpack_anon_auth_info(gnutls_session_t session, gnutls_buffer_st * ps) /* client and server have the same auth_info here */ ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_ANON, + _gnutls_auth_info_init(session, GNUTLS_CRD_ANON, sizeof(anon_auth_info_st), 1); if (ret < 0) { gnutls_assert(); @@ -797,7 +797,7 @@ unpack_psk_auth_info(gnutls_session_t session, gnutls_buffer_st * ps) unsigned pack_size; ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, + _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1); if (ret < 0) { gnutls_assert(); diff --git a/lib/tls13/certificate.c b/lib/tls13/certificate.c index b9a54df355..bf8dbda2f7 100644 --- a/lib/tls13/certificate.c +++ b/lib/tls13/certificate.c @@ -375,7 +375,7 @@ parse_cert_list(gnutls_session_t session, uint8_t * data, size_t data_size) } if ((ret = - _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE, sizeof(cert_auth_info_st), 1)) < 0) { gnutls_assert(); return ret; |