diff options
Diffstat (limited to 'include/u2f.h')
| -rw-r--r-- | include/u2f.h | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/include/u2f.h b/include/u2f.h index 5af23bc773..61b9677185 100644 --- a/include/u2f.h +++ b/include/u2f.h @@ -30,7 +30,6 @@ extern "C" { #define U2F_CHAL_SIZE 32 /* Size of challenge */ #define U2F_MAX_ATTEST_SIZE 256 /* Size of largest blob to sign */ #define U2F_P256_SIZE 32 -#define U2F_FIXED_KH_SIZE 64 /* Size of fixed size key handles */ #define ENC_SIZE(x) ((x + 7) & 0xfff8) @@ -49,6 +48,21 @@ struct u2f_ec_point { #define U2F_AUTH_ENFORCE 0x03 /* Enforce user presence and sign */ #define U2F_AUTH_CHECK_ONLY 0x07 /* Check only */ #define U2F_AUTH_FLAG_TUP 0x01 /* Test of user presence set */ +/* The key handle can be used with fingerprint or PIN. */ +#define U2F_UV_ENABLED_KH 0x08 + +#define U2F_KH_VERSION_1 0x01 + +struct u2f_key_handle { + uint8_t origin_seed[U2F_P256_SIZE]; + uint8_t hmac[U2F_P256_SIZE]; +}; + +struct u2f_versioned_key_handle { + uint8_t version; + uint8_t origin_seed[U2F_P256_SIZE]; + uint8_t hmac[U2F_P256_SIZE]; +}; /* TODO(louiscollard): Add Descriptions. */ @@ -60,15 +74,28 @@ struct u2f_generate_req { struct u2f_generate_resp { struct u2f_ec_point pubKey; /* Generated public key */ - uint8_t keyHandle[U2F_FIXED_KH_SIZE]; /* Key handle */ + struct u2f_key_handle keyHandle; +}; + +struct u2f_generate_versioned_resp { + struct u2f_ec_point pubKey; /* Generated public key */ + struct u2f_versioned_key_handle keyHandle; }; struct u2f_sign_req { uint8_t appId[U2F_APPID_SIZE]; /* Application id */ uint8_t userSecret[U2F_P256_SIZE]; - uint8_t keyHandle[U2F_FIXED_KH_SIZE]; /* Key handle */ + struct u2f_key_handle keyHandle; + uint8_t hash[U2F_P256_SIZE]; + uint8_t flags; +}; + +struct u2f_sign_versioned_req { + uint8_t appId[U2F_APPID_SIZE]; /* Application id */ + uint8_t userSecret[U2F_P256_SIZE]; uint8_t hash[U2F_P256_SIZE]; uint8_t flags; + struct u2f_versioned_key_handle keyHandle; }; struct u2f_sign_resp { |