diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-01 09:45:26 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-01 09:45:26 +0100 |
commit | 9929402e393677b78502a67f655e1fd4b13ed3fe (patch) | |
tree | 96f57a298b725b5b536f2689565ce7c481ce5715 | |
parent | f4554411c98d53231ef264e5ce634225fc06ba30 (diff) | |
download | gnutls-9929402e393677b78502a67f655e1fd4b13ed3fe.tar.gz |
_gnutls_map_pk_get_pk -> _gnutls_map_kx_get_pk
-rw-r--r-- | lib/algorithms.h | 2 | ||||
-rw-r--r-- | lib/algorithms/publickey.c | 2 | ||||
-rw-r--r-- | lib/cert.c | 2 | ||||
-rw-r--r-- | lib/handshake.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/algorithms.h b/lib/algorithms.h index ddb5828f0f..60c0915098 100644 --- a/lib/algorithms.h +++ b/lib/algorithms.h @@ -286,7 +286,7 @@ gnutls_credentials_type_t _gnutls_map_kx_get_cred(gnutls_kx_algorithm_t /* DSA + RSA + ECC */ #define GNUTLS_DISTINCT_PK_ALGORITHMS 3 -gnutls_pk_algorithm_t _gnutls_map_pk_get_pk(gnutls_kx_algorithm_t +gnutls_pk_algorithm_t _gnutls_map_kx_get_pk(gnutls_kx_algorithm_t kx_algorithm); enum encipher_type { CIPHER_ENCRYPT = 0, CIPHER_SIGN = 1, CIPHER_IGN }; diff --git a/lib/algorithms/publickey.c b/lib/algorithms/publickey.c index b7b1169fbb..5ef780986f 100644 --- a/lib/algorithms/publickey.c +++ b/lib/algorithms/publickey.c @@ -68,7 +68,7 @@ static const gnutls_pk_map pk_mappings[] = { * the given gnutls_kx_algorithm_t. */ gnutls_pk_algorithm_t -_gnutls_map_pk_get_pk(gnutls_kx_algorithm_t kx_algorithm) +_gnutls_map_kx_get_pk(gnutls_kx_algorithm_t kx_algorithm) { gnutls_pk_algorithm_t ret = -1; diff --git a/lib/cert.c b/lib/cert.c index 9d6d1ef6a8..d93b2f6cba 100644 --- a/lib/cert.c +++ b/lib/cert.c @@ -272,7 +272,7 @@ _gnutls_selected_cert_supported_kx(gnutls_session_t session, i = 0; for (kx = 0; kx < MAX_ALGOS; kx++) { - pk = _gnutls_map_pk_get_pk(kx); + pk = _gnutls_map_kx_get_pk(kx); if (pk == cert_pk) { /* then check key usage */ if (_gnutls_check_key_usage(cert, kx) == 0 || diff --git a/lib/handshake.c b/lib/handshake.c index c716d372b0..930cf28895 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -879,7 +879,7 @@ server_find_pk_algos_in_ciphersuites(const uint8_t * kx = _gnutls_cipher_suite_get_kx_algo(&data[j]); if (_gnutls_map_kx_get_cred(kx, 1) == GNUTLS_CRD_CERTIFICATE) { - pk = _gnutls_map_pk_get_pk(kx); + pk = _gnutls_map_kx_get_pk(kx); found = 0; for (x = 0; x < *algos_size; x++) { if (algos[x] == pk) { @@ -890,7 +890,7 @@ server_find_pk_algos_in_ciphersuites(const uint8_t * if (found == 0) { algos[(*algos_size)++] = - _gnutls_map_pk_get_pk(kx); + _gnutls_map_kx_get_pk(kx); if ((*algos_size) >= max) return 0; } |