From 73d2a11aee65ea5b40c6444807074d2fdf795a65 Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Mon, 28 Sep 2020 17:39:18 +0200 Subject: [PATCH] charon-tkm: Register TKM cred encoder before init Make sure the credential encoder is available early to allow getting public key fingerprints. --- src/charon-tkm/src/charon-tkm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c index e75c929dce..b1cd967050 100644 --- a/src/charon-tkm/src/charon-tkm.c +++ b/src/charon-tkm/src/charon-tkm.c @@ -326,6 +326,9 @@ int main(int argc, char *argv[]) /* register TKM keymat variant */ keymat_register_constructor(IKEV2, (keymat_constructor_t)tkm_keymat_create); + /* register TKM credential encoder */ + lib->encoding->add_encoder(lib->encoding, tkm_encoder_encode); + /* initialize daemon */ if (!charon->initialize(charon, PLUGINS)) { @@ -367,9 +370,6 @@ int main(int argc, char *argv[]) creds = tkm_cred_create(); lib->credmgr->add_set(lib->credmgr, (credential_set_t*)creds); - /* register TKM credential encoder */ - lib->encoding->add_encoder(lib->encoding, tkm_encoder_encode); - /* add handler for fatal signals, * INT and TERM are handled by sigwaitinfo() in run() */ action.sa_flags = 0;