kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump versions to 1.0 for FIDO2 certification.

Browse Source
This commit is contained in:
Jean-Michel Picod
2020-12-11 01:52:52 +01:00
parent a1854bb98a
commit ca0606a557
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "ctap2" name = "ctap2"
version = "0.1.0" version = "1.0.0"
authors = [ authors = [
"Fabian Kaczmarczyck <kaczmarczyck@google.com>", "Fabian Kaczmarczyck <kaczmarczyck@google.com>",
"Guillaume Endignoux <guillaumee@google.com>", "Guillaume Endignoux <guillaumee@google.com>",

2
boards/nordic/nrf52840_mdk_dfu/src/main.rs
View File

@@ -48,7 +48,7 @@ static STRINGS: &'static [&'static str] = &[
// Product // Product
"OpenSK", "OpenSK",
// Serial number // Serial number
"v0.1", "v1.0",
]; ];
// State for loading and holding applications. // State for loading and holding applications.

4
patches/tock/02-usb.patch
View File

@@ -117,7 +117,7 @@ index d72d20482..118ea6d68 100644
+ // Product + // Product
+ "OpenSK", + "OpenSK",
+ // Serial number + // Serial number
+ "v0.1", + "v1.0",
+]; +];
+ +
// State for loading and holding applications. // State for loading and holding applications.
@@ -189,7 +189,7 @@ index 2ebb384d8..4a7bfffdd 100644
+ // Product + // Product
+ "OpenSK", + "OpenSK",
+ // Serial number + // Serial number
+ "v0.1", + "v1.0",
+]; +];
+ +
// State for loading and holding applications. // State for loading and holding applications.

9
src/ctap/hid/mod.rs
View File

@@ -117,9 +117,8 @@ impl CtapHid {
// CTAP specification (version 20190130) section 8.1.9.1.3 // CTAP specification (version 20190130) section 8.1.9.1.3
const PROTOCOL_VERSION: u8 = 2; const PROTOCOL_VERSION: u8 = 2;
// The device version number is vendor-defined. For now we define them to be zero. // The device version number is vendor-defined.
// TODO: Update with device version? const DEVICE_VERSION_MAJOR: u8 = 1;
const DEVICE_VERSION_MAJOR: u8 = 0;
const DEVICE_VERSION_MINOR: u8 = 0; const DEVICE_VERSION_MINOR: u8 = 0;
const DEVICE_VERSION_BUILD: u8 = 0; const DEVICE_VERSION_BUILD: u8 = 0;
@@ -574,7 +573,7 @@ mod test {
0x00, 0x00,
0x01, 0x01,
0x02, // Protocol version 0x02, // Protocol version
0x00, // Device version 0x01, // Device version
0x00, 0x00,
0x00, 0x00,
CtapHid::CAPABILITIES CtapHid::CAPABILITIES
@@ -634,7 +633,7 @@ mod test {
cid[2], cid[2],
cid[3], cid[3],
0x02, // Protocol version 0x02, // Protocol version
0x00, // Device version 0x01, // Device version
0x00, 0x00,
0x00, 0x00,
CtapHid::CAPABILITIES CtapHid::CAPABILITIES