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

Addressing review comments.

Browse Source
This commit is contained in:
Jean-Michel Picod
2020-12-11 23:56:53 +01:00
parent 7213c4ee99
commit 8595ed5e28
4 changed files with 244 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
patches/tock/07-firmware-protect.patch
View File

@@ -1,9 +1,9 @@
diff --git a/boards/components/src/firmware_protection.rs b/boards/components/src/firmware_protection.rs diff --git a/boards/components/src/firmware_protection.rs b/boards/components/src/firmware_protection.rs
new file mode 100644 new file mode 100644
index 0000000..5eda591 index 0000000..58695af
--- /dev/null --- /dev/null
+++ b/boards/components/src/firmware_protection.rs +++ b/boards/components/src/firmware_protection.rs
@@ -0,0 +1,67 @@ @@ -0,0 +1,70 @@
+//! Component for firmware protection syscall interface. +//! Component for firmware protection syscall interface.
+//! +//!
+//! This provides one Component, `FirmwareProtectionComponent`, which implements a +//! This provides one Component, `FirmwareProtectionComponent`, which implements a
@@ -35,12 +35,13 @@ index 0000000..5eda591
+ ($C:ty) => {{ + ($C:ty) => {{
+ use capsules::firmware_protection; + use capsules::firmware_protection;
+ use core::mem::MaybeUninit; + use core::mem::MaybeUninit;
+ static mut BUF: MaybeUninit<firmware_protection::FirmwareProtection<'static, $C>> = MaybeUninit::uninit(); + static mut BUF: MaybeUninit<firmware_protection::FirmwareProtection<$C>> =
+ MaybeUninit::uninit();
+ &mut BUF + &mut BUF
+ };}; + };};
+} +}
+ +
+pub struct FirmwareProtectionComponent<C: 'static + hil::firmware_protection::FirmwareProtection> { +pub struct FirmwareProtectionComponent<C: hil::firmware_protection::FirmwareProtection> {
+ board_kernel: &'static kernel::Kernel, + board_kernel: &'static kernel::Kernel,
+ crp: C, + crp: C,
+} +}
@@ -54,16 +55,18 @@ index 0000000..5eda591
+ } + }
+} +}
+ +
+impl<C: 'static + hil::firmware_protection::FirmwareProtection> Component for FirmwareProtectionComponent<C> { +impl<C: 'static + hil::firmware_protection::FirmwareProtection> Component
+ type StaticInput = &'static mut MaybeUninit<firmware_protection::FirmwareProtection<'static, C>>; + for FirmwareProtectionComponent<C>
+ type Output = &'static firmware_protection::FirmwareProtection<'static, C>; +{
+ type StaticInput = &'static mut MaybeUninit<firmware_protection::FirmwareProtection<C>>;
+ type Output = &'static firmware_protection::FirmwareProtection<C>;
+ +
+ unsafe fn finalize(self, static_buffer: Self::StaticInput) -> Self::Output { + unsafe fn finalize(self, static_buffer: Self::StaticInput) -> Self::Output {
+ let grant_cap = create_capability!(capabilities::MemoryAllocationCapability); + let grant_cap = create_capability!(capabilities::MemoryAllocationCapability);
+ +
+ static_init_half!( + static_init_half!(
+ static_buffer, + static_buffer,
+ firmware_protection::FirmwareProtection<'static, C>, + firmware_protection::FirmwareProtection<C>,
+ firmware_protection::FirmwareProtection::new( + firmware_protection::FirmwareProtection::new(
+ self.crp, + self.crp,
+ self.board_kernel.create_grant(&grant_cap), + self.board_kernel.create_grant(&grant_cap),
@@ -84,21 +87,18 @@ index 917497a..520408f 100644
pub mod gpio; pub mod gpio;
pub mod hd44780; pub mod hd44780;
diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs
index 118ea6d..f340dd1 100644 index 118ea6d..76436f3 100644
--- a/boards/nordic/nrf52840_dongle/src/main.rs --- a/boards/nordic/nrf52840_dongle/src/main.rs
+++ b/boards/nordic/nrf52840_dongle/src/main.rs +++ b/boards/nordic/nrf52840_dongle/src/main.rs
@@ -112,6 +112,10 @@ pub struct Platform { @@ -112,6 +112,7 @@ pub struct Platform {
'static, 'static,
nrf52840::usbd::Usbd<'static>, nrf52840::usbd::Usbd<'static>,
>, >,
+ crp: &'static capsules::firmware_protection::FirmwareProtection< + crp: &'static capsules::firmware_protection::FirmwareProtection<nrf52840::uicr::Uicr>,
+ 'static,
+ nrf52840::uicr::Uicr,
+ >,
} }
impl kernel::Platform for Platform { impl kernel::Platform for Platform {
@@ -132,6 +136,7 @@ impl kernel::Platform for Platform { @@ -132,6 +133,7 @@ impl kernel::Platform for Platform {
capsules::analog_comparator::DRIVER_NUM => f(Some(self.analog_comparator)), capsules::analog_comparator::DRIVER_NUM => f(Some(self.analog_comparator)),
nrf52840::nvmc::DRIVER_NUM => f(Some(self.nvmc)), nrf52840::nvmc::DRIVER_NUM => f(Some(self.nvmc)),
capsules::usb::usb_ctap::DRIVER_NUM => f(Some(self.usb)), capsules::usb::usb_ctap::DRIVER_NUM => f(Some(self.usb)),
@@ -106,7 +106,7 @@ index 118ea6d..f340dd1 100644
kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)), kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)),
_ => f(None), _ => f(None),
} }
@@ -355,6 +360,12 @@ pub unsafe fn reset_handler() { @@ -355,6 +357,14 @@ pub unsafe fn reset_handler() {
) )
.finalize(components::usb_ctap_component_buf!(nrf52840::usbd::Usbd)); .finalize(components::usb_ctap_component_buf!(nrf52840::usbd::Usbd));
@@ -114,12 +114,14 @@ index 118ea6d..f340dd1 100644
+ board_kernel, + board_kernel,
+ nrf52840::uicr::Uicr::new(), + nrf52840::uicr::Uicr::new(),
+ ) + )
+ .finalize(components::firmware_protection_component_helper!(nrf52840::uicr::Uicr)); + .finalize(components::firmware_protection_component_helper!(
+ nrf52840::uicr::Uicr
+ ));
+ +
nrf52_components::NrfClockComponent::new().finalize(()); nrf52_components::NrfClockComponent::new().finalize(());
let platform = Platform { let platform = Platform {
@@ -371,6 +382,7 @@ pub unsafe fn reset_handler() { @@ -371,6 +381,7 @@ pub unsafe fn reset_handler() {
analog_comparator, analog_comparator,
nvmc, nvmc,
usb, usb,
@@ -128,21 +130,18 @@ index 118ea6d..f340dd1 100644
}; };
diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs
index b1d0d3c..a37d180 100644 index b1d0d3c..3cfb38d 100644
--- a/boards/nordic/nrf52840dk/src/main.rs --- a/boards/nordic/nrf52840dk/src/main.rs
+++ b/boards/nordic/nrf52840dk/src/main.rs +++ b/boards/nordic/nrf52840dk/src/main.rs
@@ -180,6 +180,10 @@ pub struct Platform { @@ -180,6 +180,7 @@ pub struct Platform {
'static, 'static,
nrf52840::usbd::Usbd<'static>, nrf52840::usbd::Usbd<'static>,
>, >,
+ crp: &'static capsules::firmware_protection::FirmwareProtection< + crp: &'static capsules::firmware_protection::FirmwareProtection<nrf52840::uicr::Uicr>,
+ 'static,
+ nrf52840::uicr::Uicr,
+ >,
} }
impl kernel::Platform for Platform { impl kernel::Platform for Platform {
@@ -201,6 +205,7 @@ impl kernel::Platform for Platform { @@ -201,6 +202,7 @@ impl kernel::Platform for Platform {
capsules::nonvolatile_storage_driver::DRIVER_NUM => f(Some(self.nonvolatile_storage)), capsules::nonvolatile_storage_driver::DRIVER_NUM => f(Some(self.nonvolatile_storage)),
nrf52840::nvmc::DRIVER_NUM => f(Some(self.nvmc)), nrf52840::nvmc::DRIVER_NUM => f(Some(self.nvmc)),
capsules::usb::usb_ctap::DRIVER_NUM => f(Some(self.usb)), capsules::usb::usb_ctap::DRIVER_NUM => f(Some(self.usb)),
@@ -150,7 +149,7 @@ index b1d0d3c..a37d180 100644
kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)), kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)),
_ => f(None), _ => f(None),
} }
@@ -480,6 +485,12 @@ pub unsafe fn reset_handler() { @@ -480,6 +482,14 @@ pub unsafe fn reset_handler() {
) )
.finalize(components::usb_ctap_component_buf!(nrf52840::usbd::Usbd)); .finalize(components::usb_ctap_component_buf!(nrf52840::usbd::Usbd));
@@ -158,12 +157,14 @@ index b1d0d3c..a37d180 100644
+ board_kernel, + board_kernel,
+ nrf52840::uicr::Uicr::new(), + nrf52840::uicr::Uicr::new(),
+ ) + )
+ .finalize(components::firmware_protection_component_helper!(nrf52840::uicr::Uicr)); + .finalize(components::firmware_protection_component_helper!(
+ nrf52840::uicr::Uicr
+ ));
+ +
nrf52_components::NrfClockComponent::new().finalize(()); nrf52_components::NrfClockComponent::new().finalize(());
let platform = Platform { let platform = Platform {
@@ -497,6 +508,7 @@ pub unsafe fn reset_handler() { @@ -497,6 +507,7 @@ pub unsafe fn reset_handler() {
nonvolatile_storage, nonvolatile_storage,
nvmc, nvmc,
usb, usb,
@@ -185,10 +186,10 @@ index ae458b3..f536dad 100644
Ipc = 0x10000, Ipc = 0x10000,
diff --git a/capsules/src/firmware_protection.rs b/capsules/src/firmware_protection.rs diff --git a/capsules/src/firmware_protection.rs b/capsules/src/firmware_protection.rs
new file mode 100644 new file mode 100644
index 0000000..2c61d06 index 0000000..dc46a13
--- /dev/null --- /dev/null
+++ b/capsules/src/firmware_protection.rs +++ b/capsules/src/firmware_protection.rs
@@ -0,0 +1,87 @@ @@ -0,0 +1,85 @@
+//! Provides userspace control of firmware protection on a board. +//! Provides userspace control of firmware protection on a board.
+//! +//!
+//! This allows an application to enable firware readout protection, +//! This allows an application to enable firware readout protection,
@@ -213,7 +214,7 @@ index 0000000..2c61d06
+//! Syscall Interface +//! Syscall Interface
+//! ----------------- +//! -----------------
+//! +//!
+//! - Stability: 2 - Stable +//! - Stability: 0 - Draft
+//! +//!
+//! ### Command +//! ### Command
+//! +//!
@@ -222,10 +223,10 @@ index 0000000..2c61d06
+//! #### `command_num` +//! #### `command_num`
+//! +//!
+//! - `0`: Driver check. +//! - `0`: Driver check.
+//! - `1`: Enable firmware readout protection (aka CRP). +//! - `1`: Get current firmware readout protection (aka CRP) state.
+//! - `2`: Set current firmware readout protection (aka CRP) state.
+//! +//!
+ +
+use core::marker::PhantomData;
+use kernel::hil; +use kernel::hil;
+use kernel::{AppId, Callback, Driver, Grant, ReturnCode}; +use kernel::{AppId, Callback, Driver, Grant, ReturnCode};
+ +
@@ -233,43 +234,41 @@ index 0000000..2c61d06
+use crate::driver; +use crate::driver;
+pub const DRIVER_NUM: usize = driver::NUM::FirmwareProtection as usize; +pub const DRIVER_NUM: usize = driver::NUM::FirmwareProtection as usize;
+ +
+pub struct FirmwareProtection<'a, C: hil::firmware_protection::FirmwareProtection> { +pub struct FirmwareProtection<C: hil::firmware_protection::FirmwareProtection> {
+ crp_unit: C, + crp_unit: C,
+ apps: Grant<Option<Callback>>, + apps: Grant<Option<Callback>>,
+ _phantom: PhantomData<&'a C>,
+} +}
+ +
+impl<'a, C: hil::firmware_protection::FirmwareProtection> FirmwareProtection<'a, C> { +impl<C: hil::firmware_protection::FirmwareProtection> FirmwareProtection<C> {
+ pub fn new( + pub fn new(crp_unit: C, apps: Grant<Option<Callback>>) -> Self {
+ crp_unit: C, + Self { crp_unit, apps }
+ apps: Grant<Option<Callback>>,
+ ) -> Self {
+ Self {
+ crp_unit,
+ apps,
+ _phantom: PhantomData,
+ }
+ } + }
+} +}
+ +
+impl<'a, C: hil::firmware_protection::FirmwareProtection> Driver for FirmwareProtection<'a, C> { +impl<C: hil::firmware_protection::FirmwareProtection> Driver for FirmwareProtection<C> {
+ /// + ///
+ /// ### Command numbers + /// ### Command numbers
+ /// + ///
+ /// * `0`: Returns non-zero to indicate the driver is present. + /// * `0`: Returns non-zero to indicate the driver is present.
+ /// * `1`: Enable firmware protection. + /// * `1`: Gets firmware protection state.
+ fn command(&self, command_num: usize, _: usize, _: usize, appid: AppId) -> ReturnCode { + /// * `2`: Sets firmware protection state.
+ fn command(&self, command_num: usize, data: usize, _: usize, appid: AppId) -> ReturnCode {
+ match command_num { + match command_num {
+ // return if driver is available + // return if driver is available
+ 0 => ReturnCode::SUCCESS, + 0 => ReturnCode::SUCCESS,
+ +
+ // enable firmware protection + 1 => self
+ 1 => { + .apps
+ self.apps.enter(appid, |_, _| { + .enter(appid, |_, _| ReturnCode::SuccessWithValue {
+ self.crp_unit.protect() + value: self.crp_unit.get_protection() as usize,
+ }) + })
+ .unwrap_or_else(|err| err.into()) + .unwrap_or_else(|err| err.into()),
+ } +
+ // sets firmware protection
+ 2 => self
+ .apps
+ .enter(appid, |_, _| self.crp_unit.set_protection(data.into()))
+ .unwrap_or_else(|err| err.into()),
+ +
+ // default + // default
+ _ => ReturnCode::ENOSUPPORT, + _ => ReturnCode::ENOSUPPORT,
@@ -289,10 +288,18 @@ index e4423fe..7538aad 100644
pub mod ft6x06; pub mod ft6x06;
pub mod fxos8700cq; pub mod fxos8700cq;
diff --git a/chips/nrf52/src/uicr.rs b/chips/nrf52/src/uicr.rs diff --git a/chips/nrf52/src/uicr.rs b/chips/nrf52/src/uicr.rs
index 3bb8b5a..b8895d3 100644 index 3bb8b5a..19c2e90 100644
--- a/chips/nrf52/src/uicr.rs --- a/chips/nrf52/src/uicr.rs
+++ b/chips/nrf52/src/uicr.rs +++ b/chips/nrf52/src/uicr.rs
@@ -8,6 +8,7 @@ use kernel::hil; @@ -1,13 +1,14 @@
//! User information configuration registers
-
use enum_primitive::cast::FromPrimitive;
+use hil::firmware_protection::ProtectionLevel;
use kernel::common::registers::{register_bitfields, register_structs, ReadWrite};
use kernel::common::StaticRef;
use kernel::hil;
use kernel::ReturnCode; use kernel::ReturnCode;
use crate::gpio::Pin; use crate::gpio::Pin;
@@ -300,21 +307,47 @@ index 3bb8b5a..b8895d3 100644
const UICR_BASE: StaticRef<UicrRegisters> = const UICR_BASE: StaticRef<UicrRegisters> =
unsafe { StaticRef::new(0x10001000 as *const UicrRegisters) }; unsafe { StaticRef::new(0x10001000 as *const UicrRegisters) };
@@ -210,3 +211,20 @@ impl Uicr { @@ -210,3 +211,46 @@ impl Uicr {
self.registers.approtect.write(ApProtect::PALL::ENABLED); self.registers.approtect.write(ApProtect::PALL::ENABLED);
} }
} }
+ +
+impl hil::firmware_protection::FirmwareProtection for Uicr { +impl hil::firmware_protection::FirmwareProtection for Uicr {
+ fn protect(&self) -> ReturnCode { + fn get_protection(&self) -> ProtectionLevel {
+ let ap_protect_state = self.is_ap_protect_enabled();
+ let cpu_debug_state = self
+ .registers
+ .debugctrl
+ .matches_all(DebugControl::CPUNIDEN::ENABLED + DebugControl::CPUFPBEN::ENABLED);
+ match (ap_protect_state, cpu_debug_state) {
+ (false, _) => ProtectionLevel::NoProtection,
+ (true, true) => ProtectionLevel::JtagDisabled,
+ (true, false) => ProtectionLevel::FullyLocked,
+ }
+ }
+
+ fn set_protection(&self, level: ProtectionLevel) -> ReturnCode {
+ let current_level = self.get_protection();
+ if current_level > level || level == ProtectionLevel::Unknown {
+ return ReturnCode::EINVAL;
+ }
+ if current_level == level {
+ return ReturnCode::EALREADY;
+ }
+ unsafe { NVMC.configure_writeable() }; + unsafe { NVMC.configure_writeable() };
+ self.set_ap_protect(); + if level >= ProtectionLevel::JtagDisabled {
+ // Prevent CPU debug + self.set_ap_protect();
+ self.registers.debugctrl.write( + }
+ DebugControl::CPUNIDEN::DISABLED + DebugControl::CPUFPBEN::DISABLED); + if level >= ProtectionLevel::FullyLocked {
+ // TODO(jmichel): Kill bootloader if present + // Prevent CPU debug and flash patching. Leaving these enabled could
+ // allow to circumvent protection.
+ self.registers
+ .debugctrl
+ .write(DebugControl::CPUNIDEN::DISABLED + DebugControl::CPUFPBEN::DISABLED);
+ // TODO(jmichel): Kill bootloader if present
+ }
+ unsafe { NVMC.configure_readonly() }; + unsafe { NVMC.configure_readonly() };
+ if self.is_ap_protect_enabled() { + if self.get_protection() == level {
+ ReturnCode::SUCCESS + ReturnCode::SUCCESS
+ } else { + } else {
+ ReturnCode::FAIL + ReturnCode::FAIL
@@ -323,17 +356,57 @@ index 3bb8b5a..b8895d3 100644
+} +}
diff --git a/kernel/src/hil/firmware_protection.rs b/kernel/src/hil/firmware_protection.rs diff --git a/kernel/src/hil/firmware_protection.rs b/kernel/src/hil/firmware_protection.rs
new file mode 100644 new file mode 100644
index 0000000..e43fdf0 index 0000000..de08246
--- /dev/null --- /dev/null
+++ b/kernel/src/hil/firmware_protection.rs +++ b/kernel/src/hil/firmware_protection.rs
@@ -0,0 +1,8 @@ @@ -0,0 +1,48 @@
+//! Interface for Firmware Protection, also called Code Readout Protection. +//! Interface for Firmware Protection, also called Code Readout Protection.
+ +
+use crate::returncode::ReturnCode; +use crate::returncode::ReturnCode;
+ +
+#[derive(PartialOrd, PartialEq)]
+pub enum ProtectionLevel {
+ /// Unsupported feature
+ Unknown = 0,
+ /// This should be the factory default for the chip.
+ NoProtection = 1,
+ /// At this level, only JTAG/SWD are disabled but other debugging
+ /// features may still be enabled.
+ JtagDisabled = 2,
+ /// This is the maximum level of protection the chip supports.
+ /// At this level, JTAG and all other features are expected to be
+ /// disabled and only a full chip erase may allow to recover from
+ /// that state.
+ FullyLocked = 0xff,
+}
+
+impl From<usize> for ProtectionLevel {
+ fn from(value: usize) -> Self {
+ match value {
+ 1 => ProtectionLevel::NoProtection,
+ 2 => ProtectionLevel::JtagDisabled,
+ 0xff => ProtectionLevel::FullyLocked,
+ _ => ProtectionLevel::Unknown,
+ }
+ }
+}
+
+pub trait FirmwareProtection { +pub trait FirmwareProtection {
+ /// Disable debug ports and protects the device. + /// Gets the current firmware protection level.
+ fn protect(&self) -> ReturnCode; + /// This doesn't fail and always returns a value.
+ fn get_protection(&self) -> ProtectionLevel;
+
+ /// Sets the firmware protection level.
+ /// There are four valid return values:
+ /// - SUCCESS: protection level has been set to `level`
+ /// - FAIL: something went wrong while setting the protection
+ /// level and the effective protection level is not the one
+ /// that was requested.
+ /// - EALREADY: the requested protection level is already the
+ /// level that is set.
+ /// - EINVAL: unsupported protection level or the requested
+ /// protection level is lower than the currently set one.
+ fn set_protection(&self, level: ProtectionLevel) -> ReturnCode;
+} +}
diff --git a/kernel/src/hil/mod.rs b/kernel/src/hil/mod.rs diff --git a/kernel/src/hil/mod.rs b/kernel/src/hil/mod.rs
index 4f42afa..83e7702 100644 index 4f42afa..83e7702 100644

89
src/ctap/mod.rs
View File

@@ -67,6 +67,7 @@ use crypto::sha256::Sha256;
use crypto::Hash256; use crypto::Hash256;
#[cfg(feature = "debug_ctap")] #[cfg(feature = "debug_ctap")]
use libtock_drivers::console::Console; use libtock_drivers::console::Console;
use libtock_drivers::crp;
use libtock_drivers::timer::{ClockValue, Duration}; use libtock_drivers::timer::{ClockValue, Duration};
// This flag enables or disables basic attestation for FIDO2. U2F is unaffected by // This flag enables or disables basic attestation for FIDO2. U2F is unaffected by
@@ -934,59 +935,43 @@ where
let current_priv_key = self.persistent_store.attestation_private_key()?; let current_priv_key = self.persistent_store.attestation_private_key()?;
let current_cert = self.persistent_store.attestation_certificate()?; let current_cert = self.persistent_store.attestation_certificate()?;
let response = if params.attestation_material.is_some() { let response = match params.attestation_material {
let data = params.attestation_material.unwrap(); // Only reading values.
None => AuthenticatorVendorResponse {
match (current_cert, current_priv_key) {
(Some(_), Some(_)) => {
// Device is fully programmed.
// We don't compare values to avoid giving an oracle
// about the private key.
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
}
// Device is not programmed.
(None, None) => {
self.persistent_store
.set_attestation_certificate(&data.certificate)?;
self.persistent_store
.set_attestation_private_key(&data.private_key)?;
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
}
// Device is partially programmed. Ensure the programmed value
// matched the given one before programming anything.
(Some(cert), None) => {
if cert != data.certificate {
return Err(Ctap2StatusCode::CTAP1_ERR_INVALID_PARAMETER);
}
self.persistent_store
.set_attestation_private_key(&data.private_key)?;
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
}
(None, Some(key)) => {
if key != data.private_key {
return Err(Ctap2StatusCode::CTAP1_ERR_INVALID_PARAMETER);
}
self.persistent_store
.set_attestation_certificate(&data.certificate)?;
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
}
}
} else {
AuthenticatorVendorResponse {
cert_programmed: current_cert.is_some(), cert_programmed: current_cert.is_some(),
pkey_programmed: current_priv_key.is_some(), pkey_programmed: current_priv_key.is_some(),
},
// Device is already fully programmed. We don't leak information.
Some(_) if current_cert.is_some() && current_priv_key.is_some() => {
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
}
// Device is partially or not programmed. We complete the process.
Some(data) => {
if let Some(current_cert) = &current_cert {
if current_cert != &data.certificate {
return Err(Ctap2StatusCode::CTAP1_ERR_INVALID_PARAMETER);
}
}
if let Some(current_priv_key) = &current_priv_key {
if current_priv_key != &data.private_key {
return Err(Ctap2StatusCode::CTAP1_ERR_INVALID_PARAMETER);
}
}
if current_cert.is_none() {
self.persistent_store
.set_attestation_certificate(&data.certificate)?;
}
if current_priv_key.is_none() {
self.persistent_store
.set_attestation_private_key(&data.private_key)?;
}
AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: true,
}
} }
}; };
if params.lockdown { if params.lockdown {
@@ -999,7 +984,7 @@ where
let need_certificate = USE_BATCH_ATTESTATION; let need_certificate = USE_BATCH_ATTESTATION;
if (need_certificate && !(response.pkey_programmed && response.cert_programmed)) if (need_certificate && !(response.pkey_programmed && response.cert_programmed))
|| libtock_drivers::crp::protect().is_err() || crp::set_protection(crp::ProtectionLevel::FullyLocked).is_err()
{ {
return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR); return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR);
} }

30
src/ctap/response.rs
View File

@@ -424,4 +424,34 @@ mod test {
let response_cbor: Option<cbor::Value> = ResponseData::AuthenticatorSelection.into(); let response_cbor: Option<cbor::Value> = ResponseData::AuthenticatorSelection.into();
assert_eq!(response_cbor, None); assert_eq!(response_cbor, None);
} }
#[test]
fn test_vendor_response_into_cbor() {
let response_cbor: Option<cbor::Value> =
ResponseData::AuthenticatorVendor(AuthenticatorVendorResponse {
cert_programmed: true,
pkey_programmed: false,
})
.into();
assert_eq!(
response_cbor,
Some(cbor_map_options! {
1 => true,
2 => false,
})
);
let response_cbor: Option<cbor::Value> =
ResponseData::AuthenticatorVendor(AuthenticatorVendorResponse {
cert_programmed: false,
pkey_programmed: true,
})
.into();
assert_eq!(
response_cbor,
Some(cbor_map_options! {
1 => false,
2 => true,
})
);
}
} }

39
third_party/libtock-drivers/src/crp.rs vendored
View File

@@ -5,7 +5,35 @@ const DRIVER_NUMBER: usize = 0x00008;
mod command_nr { mod command_nr {
pub const AVAILABLE: usize = 0; pub const AVAILABLE: usize = 0;
pub const PROTECT: usize = 1; pub const GET_PROTECTION: usize = 1;
pub const SET_PROTECTION: usize = 2;
}
#[derive(PartialOrd, PartialEq)]
pub enum ProtectionLevel {
/// Unsupported feature
Unknown = 0,
/// This should be the factory default for the chip.
NoProtection = 1,
/// At this level, only JTAG/SWD are disabled but other debugging
/// features may still be enabled.
JtagDisabled = 2,
/// This is the maximum level of protection the chip supports.
/// At this level, JTAG and all other features are expected to be
/// disabled and only a full chip erase may allow to recover from
/// that state.
FullyLocked = 0xff,
}
impl From<usize> for ProtectionLevel {
fn from(value: usize) -> Self {
match value {
1 => ProtectionLevel::NoProtection,
2 => ProtectionLevel::JtagDisabled,
0xff => ProtectionLevel::FullyLocked,
_ => ProtectionLevel::Unknown,
}
}
} }
pub fn is_available() -> TockResult<()> { pub fn is_available() -> TockResult<()> {
@@ -13,7 +41,12 @@ pub fn is_available() -> TockResult<()> {
Ok(()) Ok(())
} }
pub fn protect() -> TockResult<()> { pub fn get_protection() -> TockResult<ProtectionLevel> {
syscalls::command(DRIVER_NUMBER, command_nr::PROTECT, 0, 0)?; let current_level = syscalls::command(DRIVER_NUMBER, command_nr::GET_PROTECTION, 0, 0)?;
Ok(current_level.into())
}
pub fn set_protection(level: ProtectionLevel) -> TockResult<()> {
syscalls::command(DRIVER_NUMBER, command_nr::SET_PROTECTION, level as usize, 0)?;
Ok(()) Ok(())
} }