From 8c1e0028920f693ba78dbe5e682a57c1758e1622 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 20 Aug 2024 14:29:25 +0200 Subject: [PATCH] select_app now invokes U2F or FIDO depending on the message. Signed-off-by: Pol Henarejos --- pico-keys-sdk | 2 +- src/fido/fido.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pico-keys-sdk b/pico-keys-sdk index c1571c0..38f0e2c 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit c1571c02f8280d8b58d8bb1c7023e45ec3a56a40 +Subproject commit 38f0e2cc3a783674f9e4951ffc11d9520601407e diff --git a/src/fido/fido.c b/src/fido/fido.c index 3f772cf..9a6ab85 100644 --- a/src/fido/fido.c +++ b/src/fido/fido.c @@ -43,7 +43,7 @@ pinUvAuthToken_t paut = { 0 }; uint8_t keydev_dec[32]; bool has_keydev_dec = false; -const uint8_t _fido_aid[] = { +const uint8_t fido_aid[] = { 8, 0xA0, 0x00, 0x00, 0x06, 0x47, 0x2F, 0x00, 0x01 }; @@ -72,7 +72,6 @@ int fido_select(app_t *a) { extern uint8_t (*get_version_major)(); extern uint8_t (*get_version_minor)(); -extern const uint8_t *fido_aid; extern void (*init_fido_cb)(); extern void (*cbor_thread_func)(); extern int (*cbor_process_cb)(uint8_t, const uint8_t *, size_t); @@ -85,7 +84,6 @@ INITIALIZER ( fido_ctor ) { #endif get_version_major = fido_get_version_major; get_version_minor = fido_get_version_minor; - fido_aid = _fido_aid; init_fido_cb = init_fido; #ifndef ENABLE_EMULATION cbor_thread_func = cbor_thread; @@ -162,7 +160,7 @@ int x509_create_cert(mbedtls_ecdsa_context *ecdsa, uint8_t *buffer, size_t buffe mbedtls_x509write_crt_set_validity(&ctx, "20220901000000", "20720831235959"); mbedtls_x509write_crt_set_issuer_name(&ctx, "C=ES,O=Pico HSM,CN=Pico FIDO"); mbedtls_x509write_crt_set_subject_name(&ctx, "C=ES,O=Pico HSM,CN=Pico FIDO"); - uint8_t serial[20]; + uint8_t serial[16]; random_gen(NULL, serial, sizeof(serial)); mbedtls_x509write_crt_set_serial_raw(&ctx, serial, sizeof(serial)); mbedtls_pk_context key;