Merge branch 'development' into eddsa

polhenarejos · Sep 17, 2023 · 7c5bab8 · 7c5bab8
2 parents abe9182 + 21035d6
commit 7c5bab8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/src/fido/cbor.c b/src/fido/cbor.c
@@ -111,6 +111,10 @@ void cbor_thread() {
         if (apdu.sw == 0) {
             DEBUG_DATA(res_APDU + 1, res_APDU_size);
         }
+        else {
+            res_APDU[0] = apdu.sw;
+            apdu.sw = 0;
+        }
 
         finished_data_size = res_APDU_size + 1;
 

diff --git a/src/fido/cbor_make_credential.c b/src/fido/cbor_make_credential.c
@@ -227,6 +227,9 @@ int cbor_make_credential(const uint8_t *data, size_t len) {
                 curve = FIDO2_CURVE_ED25519;
             }
         }
+        else if (pubKeyCredParams[i].alg <= FIDO2_ALG_RS256 && pubKeyCredParams[i].alg >= FIDO2_ALG_RS512) {
+            // pass
+        }
         else {
             CBOR_ERROR(CTAP2_ERR_CBOR_UNEXPECTED_TYPE);
         }

diff --git a/src/fido/ctap2_cbor.h b/src/fido/ctap2_cbor.h
@@ -57,7 +57,7 @@ extern const bool _btrue, _bfalse;
     do                \
     {                 \
         error = e;    \
-        printf("Cbor ERROR [%s:%d]: %d\n", __FILE__, __LINE__, e); \
+        printf("Cbor ERROR [%s:%d]: %x\n", __FILE__, __LINE__, e); \
         goto err;     \
     } while (0)
 

diff --git a/src/fido/fido.h b/src/fido/fido.h
@@ -67,6 +67,9 @@ extern int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSec
 #define FIDO2_ALG_ES512     -36 //ECDSA-SHA512 P521
 #define FIDO2_ALG_ECDH_ES_HKDF_256 -25 //ECDH-ES + HKDF-256
 #define FIDO2_ALG_ES256K    -47
+#define FIDO2_ALG_RS256     -257
+#define FIDO2_ALG_RS384     -258
+#define FIDO2_ALG_RS512     -259
 
 #define FIDO2_CURVE_P256        1
 #define FIDO2_CURVE_P384        2

diff --git a/src/fido/version.h b/src/fido/version.h
@@ -18,7 +18,7 @@
 #ifndef __VERSION_H_
 #define __VERSION_H_
 
-#define PICO_FIDO_VERSION 0x0506
+#define PICO_FIDO_VERSION 0x0507
 
 #define PICO_FIDO_VERSION_MAJOR ((PICO_FIDO_VERSION >> 8) & 0xff)
 #define PICO_FIDO_VERSION_MINOR (PICO_FIDO_VERSION & 0xff)