From 27dd7d09aa0b3543af56f0a66ab62be5a5d5de55 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Thu, 3 Sep 2015 03:46:02 +0200 Subject: [PATCH] Adapt to changes of https://github.com/frankmorgner/openpace/commit/c2256ad61a1c8c9148b1ab5e76bdb752c73d9455 This should also fix a bug where the commandline input of the lookup directories given via npa-tool is overwritten with OpenPACE's default. --- npa/src/npa-tool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npa/src/npa-tool.c b/npa/src/npa-tool.c index 9c0e756..186a4fc 100644 --- a/npa/src/npa-tool.c +++ b/npa/src/npa-tool.c @@ -313,10 +313,6 @@ main (int argc, char **argv) npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA; if (cmdline.disable_ca_checks_flag) npa_default_flags |= NPA_FLAG_DISABLE_CHECK_CA; - if (cmdline.cvc_dir_given) - cvc_default_dir = cmdline.cvc_dir_arg; - if (cmdline.x509_dir_given) - x509_default_dir = cmdline.cvc_dir_arg; if (cmdline.info_flag) @@ -342,6 +338,10 @@ main (int argc, char **argv) #endif EAC_init(); + if (cmdline.cvc_dir_given) + EAC_set_cvc_default_dir(cmdline.cvc_dir_arg); + if (cmdline.x509_dir_given) + EAC_set_x509_default_dir(cmdline.cvc_dir_arg); if (cmdline.break_flag) { /* The biggest buffer sprintf could write with "%llu" */