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

added options and some refactoring

Browse source
This commit is contained in:
merlokk 2018-11-21 20:35:57 +02:00
commit e33ddad40c
2 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/fido/fido2.json
View file

@ -23,8 +23,8 @@
} }
], ],
"options": { "options": {
"up": false,
"uv": false, "uv": false,
"keyStorageDevice": true ".up": false,
".keyStorageDevice": true
} }
} }

42
client/fido/fidocore.c
View file

@ -223,34 +223,14 @@ int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
return 0; return 0;
} }
int CBOREncodeRp(json_t *root, CborEncoder *encoder) { int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
json_t *elm = json_object_get(root, "RelyingPartyEntity"); json_t *elm = json_object_get(root, rootElmId);
if (!elm) if (!elm)
return 1; return 1;
JsonToCbor(elm, encoder); int res = JsonToCbor(elm, encoder);
return 0; return res;
}
int CBOREncodeUser(json_t *root, CborEncoder *encoder) {
json_t *elm = json_object_get(root, "UserEntity");
if (!elm)
return 1;
JsonToCbor(elm, encoder);
return 0;
}
int CBOREncodePubKeyParams(json_t *root, CborEncoder *encoder) {
json_t *elm = json_object_get(root, "pubKeyCredParams");
if (!elm)
return 1;
JsonToCbor(elm, encoder);
return 0;
} }
int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) { int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
@ -266,7 +246,7 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
cbor_encoder_init(&encoder, data, maxdatalen, 0); cbor_encoder_init(&encoder, data, maxdatalen, 0);
// create main map // create main map
res = cbor_encoder_create_map(&encoder, &map, 4); res = cbor_encoder_create_map(&encoder, &map, 5);
fido_check_if(res) { fido_check_if(res) {
// clientDataHash // clientDataHash
res = cbor_encode_uint(&map, 1); res = cbor_encode_uint(&map, 1);
@ -278,24 +258,30 @@ int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatale
// rp // rp
res = cbor_encode_uint(&map, 2); res = cbor_encode_uint(&map, 2);
fido_check_if(res) { fido_check_if(res) {
res = CBOREncodeRp(root, &map); res = CBOREncodeElm(root, "RelyingPartyEntity", &map);
fido_check(res); fido_check(res);
} }
// user // user
res = cbor_encode_uint(&map, 3); res = cbor_encode_uint(&map, 3);
fido_check_if(res) { fido_check_if(res) {
res = CBOREncodeUser(root, &map); res = CBOREncodeElm(root, "UserEntity", &map);
fido_check(res); fido_check(res);
} }
// pubKeyCredParams // pubKeyCredParams
res = cbor_encode_uint(&map, 4); res = cbor_encode_uint(&map, 4);
fido_check_if(res) { fido_check_if(res) {
res = CBOREncodePubKeyParams(root, &map); res = CBOREncodeElm(root, "pubKeyCredParams", &map);
fido_check(res); fido_check(res);
} }
// options
res = cbor_encode_uint(&map, 7);
fido_check_if(res) {
res = CBOREncodeElm(root, "options", &map);
fido_check(res);
}
} }
res = cbor_encoder_close_container(&encoder, &map); res = cbor_encoder_close_container(&encoder, &map);
fido_check(res); fido_check(res);