Pass YK_KEY to args_to_config().

Upcoming option -ooath-id needs this to read the serial number
from the YubiKey we are about to program.

diff --git a/tests/test_args_to_config.c b/tests/test_args_to_config.c
index e33c9d04b7efdc47ac4687bad1c56169f1ec7613..6787c935fceeb3e6b726f677fa475fd3d406c1ef 100644 (file)
--- a/tests/test_args_to_config.c
+++ b/tests/test_args_to_config.c
@@ -42,6 +42,7 @@
 #include <ykcore.h>
 #include <ykcore_lcl.h>
 */
+#include <ykpers-args.h>
 
 /* duplicated from ykpers.c */
 struct ykp_config_t {
@@ -120,8 +121,8 @@ int _test_config (YKP_CONFIG *cfg, YK_STATUS *st, int argc, char **argv)
        /* copy version number from st into cfg */
        assert(ykp_configure_for(cfg, 1, st) == 1);
 
-       /* call args_to_config from ykpersonalize.c with a fake set of program arguments */
-       rc = args_to_config(argc, argv, cfg,
+       /* call args_to_config from ykpers-args.c with a fake set of program arguments */
+       rc = args_to_config(argc, argv, cfg, yk,
                            &infname, &outfname,
                            &autocommit, salt,
                            st, &verbose,
@@ -299,8 +300,8 @@ int _test_non_config_args(void)
        /* copy version number from st into cfg */
        assert(ykp_configure_for(cfg, 1, st) == 1);
 
-       /* call args_to_config from ykpersonalize.c with a fake set of program arguments */
-       rc = args_to_config(argc, argv, cfg,
+       /* call args_to_config from ykpers-args.c with a fake set of program arguments */
+       rc = args_to_config(argc, argv, cfg, yk,
                            &infname, &outfname,
                            &autocommit, salt,
                            st, &verbose,

diff --git a/ykpers-args.c b/ykpers-args.c
index 6617de2b6affada5e321f6409ccf75e50af85633..3117b339ecbb7bb00a1fe0fa64841b4d50698167 100644 (file)
--- a/ykpers-args.c
+++ b/ykpers-args.c
@@ -189,7 +189,7 @@ void report_yk_error()
  *
  * Done in this way to be testable (see tests/test_args_to_config.c).
  */
-int args_to_config(int argc, char **argv, YKP_CONFIG *cfg,
+int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, YK_KEY *yk,
                   const char **infname, const char **outfname,
                   bool *autocommit, char *salt,
                   YK_STATUS *st, bool *verbose,

diff --git a/ykpers-args.h b/ykpers-args.h
index d45caf6e97898b32245697e5702bebb44268eb6e..07b026de75373e79f36a8407a3e48fbeb3ee0cda 100644 (file)
--- a/ykpers-args.h
+++ b/ykpers-args.h
@@ -33,7 +33,7 @@
 
 const char *usage;
 
-int args_to_config(int argc, char **argv, YKP_CONFIG *cfg,
+int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, YK_KEY *yk,
                   const char **infname, const char **outfname,
                   bool *autocommit, char *salt,
                   YK_STATUS *st, bool *verbose,

diff --git a/ykpersonalize.c b/ykpersonalize.c
index 57490e9c989bc942c82bd6da7b2814912e2682b3..aa93f7c785168528f6b4517bb5012ac588ab2636 100644 (file)
--- a/ykpersonalize.c
+++ b/ykpersonalize.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
                goto err;
 
        /* Parse all arguments in a testable way */
-       if (! args_to_config(argc, argv, cfg,
+       if (! args_to_config(argc, argv, cfg, yk,
                             &infname, &outfname,
                             &autocommit, salt,
                             st, &verbose,