From b3a8d704c9c42748778fa29af3e651bf97c914ce Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Fri, 28 May 2021 17:30:36 +0300 Subject: [PATCH 1/5] add some help for yubikey --- client/src/cmdhffido.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c index eaaf586f5..fceb1407c 100644 --- a/client/src/cmdhffido.c +++ b/client/src/cmdhffido.c @@ -654,7 +654,9 @@ static int CmdHFFido2MakeCredential(const char *cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "hf fido make", "Execute a FIDO2 Make Credential command. Needs json file with parameters.\n" - "Sample file `fido2_defparams.json` in `client/resources/`.", + "Sample file `fido2_defparams.json` in `client/resources/`.\n" + "- for yubikey there must be only one option `\"rk\": true` or false" + , "hf fido make --> use default parameters file `fido2_defparams.json`\n" "hf fido make -f test.json --> use parameters file `text.json`" ); @@ -772,7 +774,8 @@ static int CmdHFFido2GetAssertion(const char *cmd) { CLIParserInit(&ctx, "hf fido assert", "Execute a FIDO2 Get Assertion command. Needs json file with parameters.\n" "Sample file `fido2_defparams.json` in `client/resources/`.\n" - "- Needs if `rk` option is `false` (authenticator doesn't store credential to its memory)" + "- Needs if `rk` option is `false` (authenticator doesn't store credential to its memory)\n" + "- for yubikey there must be only one option `\"up\": true` or false" , "hf fido assert --> default parameters file `fido2_defparams.json`\n" "hf fido assert -f test.json -l --> use parameters file `text.json` and add to request CredentialId"); From 4bacefeadf6f17b3e0d57bc87d0b704239aebfe7 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Fri, 28 May 2021 17:42:33 +0300 Subject: [PATCH 2/5] added fido2 aid to aidlist --- client/resources/aidlist.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/resources/aidlist.json b/client/resources/aidlist.json index e427e34bf..96f38c2f4 100644 --- a/client/resources/aidlist.json +++ b/client/resources/aidlist.json @@ -839,6 +839,14 @@ "Description": "PIV Authentication Key", "Type": "" }, + { + "AID": "A0000006472F0001", + "Vendor": "FIDO authenticator", + "Country": "global", + "Name": "U2F/FIDO2 authenticator", + "Description": "U2F and/or FIDO2 authenticator", + "Type": "" + }, { "AID": "A000000116DB00", "Vendor": "GSA - TFCS", From aa407eb5949fac4aceb47f0c05a63197027c62bf Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Thu, 3 Jun 2021 18:52:14 +0300 Subject: [PATCH 3/5] rename default fido config file --- .../resources/{fido2_defparams.json => hf-fido2_defparams.json} | 0 client/src/cmdhffido.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename client/resources/{fido2_defparams.json => hf-fido2_defparams.json} (100%) diff --git a/client/resources/fido2_defparams.json b/client/resources/hf-fido2_defparams.json similarity index 100% rename from client/resources/fido2_defparams.json rename to client/resources/hf-fido2_defparams.json diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c index fceb1407c..f7cdabab3 100644 --- a/client/src/cmdhffido.c +++ b/client/src/cmdhffido.c @@ -38,7 +38,7 @@ #include "fileutils.h" // laodFileJSONroot #define DEF_FIDO_SIZE 2048 -#define DEF_FIDO_PARAM_FILE "fido2_defparams.json" +#define DEF_FIDO_PARAM_FILE "hf-fido2_defparams.json" static int CmdHelp(const char *Cmd); From 77ee260970bc2bd7c98687ed48bacc8c4539a4b2 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Tue, 15 Jun 2021 13:46:02 +0300 Subject: [PATCH 4/5] typo --- client/src/cmdhffido.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c index f7cdabab3..508d7ce03 100644 --- a/client/src/cmdhffido.c +++ b/client/src/cmdhffido.c @@ -38,7 +38,7 @@ #include "fileutils.h" // laodFileJSONroot #define DEF_FIDO_SIZE 2048 -#define DEF_FIDO_PARAM_FILE "hf-fido2_defparams.json" +#define DEF_FIDO_PARAM_FILE "hf_fido2_defparams.json" static int CmdHelp(const char *Cmd); From 390cfb4594a3911fa4cb0043207f73ed22600973 Mon Sep 17 00:00:00 2001 From: Oleg Moiseenko <807634+merlokk@users.noreply.github.com> Date: Tue, 15 Jun 2021 13:46:27 +0300 Subject: [PATCH 5/5] Rename hf-fido2_defparams.json to hf_fido2_defparams.json --- .../{hf-fido2_defparams.json => hf_fido2_defparams.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename client/resources/{hf-fido2_defparams.json => hf_fido2_defparams.json} (100%) diff --git a/client/resources/hf-fido2_defparams.json b/client/resources/hf_fido2_defparams.json similarity index 100% rename from client/resources/hf-fido2_defparams.json rename to client/resources/hf_fido2_defparams.json