summaryrefslogtreecommitdiff
path: root/lib/auth/cert.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-07-25 13:38:34 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-08-03 11:57:52 +0200
commitfe47976a6db5b2da86d5b5c53b2bf58ea7dd28b6 (patch)
tree19bda15e1dc7508010e1bf67c43032b51faca644 /lib/auth/cert.c
parent97e50498870b009bf7259fb05130aa17f1ade6f0 (diff)
downloadgnutls-fe47976a6db5b2da86d5b5c53b2bf58ea7dd28b6.tar.gz
cleanup: removed duplicate parameter in gnutls_pubkey_st
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/auth/cert.c')
-rw-r--r--lib/auth/cert.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index 826f793e7a..70183d8785 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -1421,7 +1421,7 @@ unsigned pubkey_is_compat_with_cs(gnutls_session_t session,
gnutls_certificate_type_t cert_type,
const gnutls_cipher_suite_entry_st *cs)
{
- unsigned pk = pubkey->pk_algorithm;
+ unsigned pk = pubkey->params.algo;
unsigned key_usage;
if (session->security_parameters.cert_type != cert_type) {
@@ -1483,7 +1483,7 @@ _gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_e
return gnutls_assert_val(ret);
_gnutls_debug_log("Selected (%s) cert\n",
- gnutls_pk_get_name(session->internals.selected_cert_list[0].pubkey->pk_algorithm));
+ gnutls_pk_get_name(session->internals.selected_cert_list[0].pubkey->params.algo));
}
if (!pubkey_is_compat_with_cs(session,
@@ -1522,7 +1522,7 @@ _gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_e
cs)) {
idx = i;
_gnutls_debug_log("Selected (%s) cert based on ciphersuite %x.%x: %s\n",
- gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->pk_algorithm),
+ gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->params.algo),
(unsigned)cs->id[0],
(unsigned)cs->id[1],
cs->name);
@@ -1537,7 +1537,7 @@ _gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_e
_gnutls_handshake_log
("HSK[%p]: checking compat of %s with certificate[%d] (%s/%s)\n",
session, cs->name, i,
- gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->pk_algorithm),
+ gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->params.algo),
gnutls_certificate_type_get_name(cred->certs
[i].cert_list
[0].type));
@@ -1548,7 +1548,7 @@ _gnutls_server_select_cert(gnutls_session_t session, const gnutls_cipher_suite_e
cs)) {
idx = i;
_gnutls_debug_log("Selected (%s) cert based on ciphersuite %x.%x: %s\n",
- gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->pk_algorithm),
+ gnutls_pk_get_name(cred->certs[i].cert_list[0].pubkey->params.algo),
(unsigned)cs->id[0],
(unsigned)cs->id[1],
cs->name);