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

Duplicate the credential management command as a vendor command (#527)

Browse Source 
* Duplicate the credential management command as a vendor command

This permits to work with libfido2 and thus ssh-add. Fix #526.

* fix deploy_partition script
This commit is contained in:
Julien Cretin
2022-08-13 06:27:31 +02:00
committed by GitHub
parent c6d3f51b5f
commit d3e01d22fb
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ctap/command.rs
View File

@@ -70,8 +70,12 @@ impl Command {
const AUTHENTICATOR_CONFIG: u8 = 0x0D; const AUTHENTICATOR_CONFIG: u8 = 0x0D;
const _AUTHENTICATOR_VENDOR_FIRST: u8 = 0x40; const _AUTHENTICATOR_VENDOR_FIRST: u8 = 0x40;
const AUTHENTICATOR_VENDOR_CONFIGURE: u8 = 0x40; const AUTHENTICATOR_VENDOR_CONFIGURE: u8 = 0x40;
const AUTHENTICATOR_VENDOR_UPGRADE: u8 = 0x41; // This commands is the same as AUTHENTICATOR_CREDENTIAL_MANAGEMENT but is duplicated as a
const AUTHENTICATOR_VENDOR_UPGRADE_INFO: u8 = 0x42; // vendor command for legacy and compatibility reasons. See
// https://github.com/Yubico/libfido2/issues/628 for more information.
const AUTHENTICATOR_VENDOR_CREDENTIAL_MANAGEMENT: u8 = 0x41;
const AUTHENTICATOR_VENDOR_UPGRADE: u8 = 0x42;
const AUTHENTICATOR_VENDOR_UPGRADE_INFO: u8 = 0x43;
const _AUTHENTICATOR_VENDOR_LAST: u8 = 0xBF; const _AUTHENTICATOR_VENDOR_LAST: u8 = 0xBF;
pub fn deserialize(bytes: &[u8]) -> Result<Command, Ctap2StatusCode> { pub fn deserialize(bytes: &[u8]) -> Result<Command, Ctap2StatusCode> {
@@ -112,7 +116,8 @@ impl Command {
// Parameters are ignored. // Parameters are ignored.
Ok(Command::AuthenticatorGetNextAssertion) Ok(Command::AuthenticatorGetNextAssertion)
} }
Command::AUTHENTICATOR_CREDENTIAL_MANAGEMENT => { Command::AUTHENTICATOR_CREDENTIAL_MANAGEMENT
| Command::AUTHENTICATOR_VENDOR_CREDENTIAL_MANAGEMENT => {
let decoded_cbor = cbor_read(&bytes[1..])?; let decoded_cbor = cbor_read(&bytes[1..])?;
Ok(Command::AuthenticatorCredentialManagement( Ok(Command::AuthenticatorCredentialManagement(
AuthenticatorCredentialManagementParameters::try_from(decoded_cbor)?, AuthenticatorCredentialManagementParameters::try_from(decoded_cbor)?,

4
tools/deploy_partition.py
View File

@@ -40,8 +40,8 @@ from tockloader import tab
from tools.configure import fatal, error, info, get_opensk_devices, get_private_key from tools.configure import fatal, error, info, get_opensk_devices, get_private_key
OPENSK_VID_PID = (0x1915, 0x521F) OPENSK_VID_PID = (0x1915, 0x521F)
OPENSK_VENDOR_UPGRADE = 0x41 OPENSK_VENDOR_UPGRADE = 0x42
OPENSK_VENDOR_UPGRADE_INFO = 0x42 OPENSK_VENDOR_UPGRADE_INFO = 0x43
PAGE_SIZE = 0x1000 PAGE_SIZE = 0x1000
KERNEL_SIZE = 0x20000 KERNEL_SIZE = 0x20000
APP_SIZE = 0x20000 APP_SIZE = 0x20000