charon-tkm: Register TKM cred encoder before init

Make sure the credential encoder is available early to allow getting
public key fingerprints.

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index e75c929dce0dfbbec051f7e683183c748994dd52..b1cd9670503d8da828a672124712e97613db14a4 100644 (file)
--- 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;