From 0b14ce58027fc004e212bc0bae797945e0aec696 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 25 Feb 2015 16:58:45 +0100 Subject: [PATCH] ikev2: Log the actual signature scheme used for RFC 7427 authentication --- .../sa/ikev2/authenticators/pubkey_authenticator.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c index f7ededb89a..1f33aac7a0 100644 --- a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c +++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c @@ -249,8 +249,9 @@ METHOD(authenticator_t, build, status_t, } } DBG1(DBG_IKE, "authentication of '%Y' (myself) with %N %s", id, - auth_method_names, auth_method, - (status == SUCCESS)? "successful":"failed"); + auth_method == AUTH_DS ? signature_scheme_names : auth_method_names, + auth_method == AUTH_DS ? scheme : auth_method, + status == SUCCESS ? "successful" : "failed"); chunk_free(&octets); private->destroy(private); @@ -317,8 +318,9 @@ METHOD(authenticator_t, process, status_t, { if (public->verify(public, scheme, octets, auth_data)) { - DBG1(DBG_IKE, "authentication of '%Y' with %N successful", - id, auth_method_names, auth_method); + DBG1(DBG_IKE, "authentication of '%Y' with %N successful", id, + auth_method == AUTH_DS ? signature_scheme_names : auth_method_names, + auth_method == AUTH_DS ? scheme : auth_method); status = SUCCESS; auth->merge(auth, current_auth, FALSE); auth->add(auth, AUTH_RULE_SIGNATURE_SCHEME, (uintptr_t)scheme); -- 2.47.2