github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1300 from merlokk/fido_fix

Browse source 
Fido commands fix
This commit is contained in:
Oleg Moiseenko 2021-06-15 13:51:58 +03:00 • committed by GitHub
commit a30d926dab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/resources/aidlist.json
View file

@ -839,6 +839,14 @@
"Description": "PIV Authentication Key", "Description": "PIV Authentication Key",
"Type": "" "Type": ""
}, },
{
"AID": "A0000006472F0001",
"Vendor": "FIDO authenticator",
"Country": "global",
"Name": "U2F/FIDO2 authenticator",
"Description": "U2F and/or FIDO2 authenticator",
"Type": ""
},
{ {
"AID": "A000000116DB00", "AID": "A000000116DB00",
"Vendor": "GSA - TFCS", "Vendor": "GSA - TFCS",

0
client/resources/fido2_defparams.json → client/resources/hf_fido2_defparams.json
View file

9
client/src/cmdhffido.c
View file

@ -38,7 +38,7 @@
#include "fileutils.h" // laodFileJSONroot #include "fileutils.h" // laodFileJSONroot
#define DEF_FIDO_SIZE 2048 #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); static int CmdHelp(const char *Cmd);
@ -654,7 +654,9 @@ static int CmdHFFido2MakeCredential(const char *cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "hf fido make", CLIParserInit(&ctx, "hf fido make",
"Execute a FIDO2 Make Credential command. Needs json file with parameters.\n" "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 --> use default parameters file `fido2_defparams.json`\n"
"hf fido make -f test.json --> use parameters file `text.json`" "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", CLIParserInit(&ctx, "hf fido assert",
"Execute a FIDO2 Get Assertion command. Needs json file with parameters.\n" "Execute a FIDO2 Get Assertion command. Needs json file with parameters.\n"
"Sample file `fido2_defparams.json` in `client/resources/`.\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 --> default parameters file `fido2_defparams.json`\n"
"hf fido assert -f test.json -l --> use parameters file `text.json` and add to request CredentialId"); "hf fido assert -f test.json -l --> use parameters file `text.json` and add to request CredentialId");