adjust some of the default basis references in OpenSK storage implementation

These adjustments ideally make the system less confusing to use in
the face of secret Bases, but the spec calls for some information that
could be a leakage channel (see below).

- items that are assumed to be consistent regardless of the basis
are now forced into the System basis. This reduces potentially confusing
behavior if the system has han unlocked secret basis and things like
PIN hashes are set which appear to be global.

- There is a "global signature counter" which could leak some information
about how many credentials are in the device. However, the FIDO2 spec
enforces some plausible deniability by requiring that the counter increments
by a random value instead of by 1. In the OpenSK implementation, this increments
by a random integer from 1-8. So, if you store dozens of credentials in secret
bases, it may become less deniable due to this global signature counter.

The global signature counter seems optional, so maybe that is a feature to
be stripped out...
This commit is contained in:
bunnie 2022-06-26 14:25:54 +08:00
parent a4c6b65b11
commit 42b84ad890
2 changed files with 47 additions and 39 deletions

View file

@ -129,7 +129,7 @@ impl PersistentStore {
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::MASTER_KEYS, key::MASTER_KEYS,
None, true, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), true, true,
Some(64), Some(crate::basis_change) Some(64), Some(crate::basis_change)
) { ) {
Ok(mut master_keys) => { Ok(mut master_keys) => {
@ -152,7 +152,7 @@ impl PersistentStore {
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::CRED_RANDOM_SECRET, key::CRED_RANDOM_SECRET,
None, true, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), true, true,
Some(64), Some(crate::basis_change) Some(64), Some(crate::basis_change)
) { ) {
Ok(mut cred_random) => { Ok(mut cred_random) => {
@ -174,7 +174,7 @@ impl PersistentStore {
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::AAGUID, key::AAGUID,
None, true, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), true, true,
Some(16), Some(crate::basis_change) Some(16), Some(crate::basis_change)
) { ) {
Ok(mut aaguid) => { Ok(mut aaguid) => {
@ -220,7 +220,7 @@ impl PersistentStore {
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_PRIVATE_KEY, key::ATTESTATION_PRIVATE_KEY,
None, true, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), true, true,
Some(32), Some(crate::basis_change) Some(32), Some(crate::basis_change)
) { ) {
Ok(mut aapriv) => { Ok(mut aapriv) => {
@ -244,7 +244,7 @@ impl PersistentStore {
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_CERTIFICATE, key::ATTESTATION_CERTIFICATE,
None, true, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), true, true,
Some(512), Some(crate::basis_change) Some(512), Some(crate::basis_change)
) { ) {
Ok(mut cert) => { Ok(mut cert) => {
@ -516,7 +516,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::GLOBAL_SIGNATURE_COUNTER, key::GLOBAL_SIGNATURE_COUNTER,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(4), Some(crate::basis_change) Some(4), Some(crate::basis_change)
) { ) {
Ok(mut gsc) => { Ok(mut gsc) => {
@ -546,7 +546,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::GLOBAL_SIGNATURE_COUNTER, key::GLOBAL_SIGNATURE_COUNTER,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(4), Some(crate::basis_change) Some(4), Some(crate::basis_change)
) { ) {
Ok(mut gsc) => { Ok(mut gsc) => {
@ -565,7 +565,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::MASTER_KEYS, key::MASTER_KEYS,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false, None, Some(crate::basis_change)
) { ) {
Ok(mut mk) => { Ok(mut mk) => {
let mut master_keys = [0u8; 64]; let mut master_keys = [0u8; 64];
@ -588,7 +588,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::CRED_RANDOM_SECRET, key::CRED_RANDOM_SECRET,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false, None, Some(crate::basis_change)
) { ) {
Ok(mut crs) => { Ok(mut crs) => {
let mut cred_random_secret = [0u8; 64]; let mut cred_random_secret = [0u8; 64];
@ -609,7 +609,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::PIN_HASH, key::PIN_HASH,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false, None, Some(crate::basis_change)
) { ) {
Ok(mut ph) => { Ok(mut ph) => {
let mut pin_hash = [0u8; PIN_AUTH_LENGTH]; let mut pin_hash = [0u8; PIN_AUTH_LENGTH];
@ -648,7 +648,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::PIN_HASH, key::PIN_HASH,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(PIN_AUTH_LENGTH), Some(crate::basis_change) Some(PIN_AUTH_LENGTH), Some(crate::basis_change)
) { ) {
Ok(mut ph) => { Ok(mut ph) => {
@ -677,7 +677,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::PIN_RETRIES, key::PIN_RETRIES,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false, None, Some(crate::basis_change)
) { ) {
Ok(mut pr) => { Ok(mut pr) => {
let mut value = [0u8; 1]; let mut value = [0u8; 1];
@ -701,7 +701,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::PIN_RETRIES, key::PIN_RETRIES,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(1), Some(crate::basis_change) Some(1), Some(crate::basis_change)
) { ) {
Ok(mut pr) => { Ok(mut pr) => {
@ -721,7 +721,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().delete_key( match self.pddb.borrow().delete_key(
FIDO_DICT, FIDO_DICT,
PIN_RETRIES, PIN_RETRIES,
None Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS)
) { ) {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(e) => match e.kind() { Err(e) => match e.kind() {
@ -737,7 +737,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::MIN_PIN_LENGTH, key::MIN_PIN_LENGTH,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS),
false, false, None, Some(crate::basis_change)
) { ) {
Ok(mut pr) => { Ok(mut pr) => {
let mut value = [0u8; 1]; let mut value = [0u8; 1];
@ -759,7 +760,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::MIN_PIN_LENGTH, key::MIN_PIN_LENGTH,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(1), Some(crate::basis_change) Some(1), Some(crate::basis_change)
) { ) {
Ok(mut pl) => { Ok(mut pl) => {
@ -779,7 +780,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
if let Some(mut mplri) = self.pddb.borrow().get( if let Some(mut mplri) = self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::_MIN_PIN_LENGTH_RP_IDS, key::_MIN_PIN_LENGTH_RP_IDS,
None, false, false, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false,
None, Some(crate::basis_change) None, Some(crate::basis_change)
).ok() { ).ok() {
let mut data = Vec::<u8>::new(); let mut data = Vec::<u8>::new();
@ -812,7 +813,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_DICT, FIDO_DICT,
key::_MIN_PIN_LENGTH_RP_IDS, key::_MIN_PIN_LENGTH_RP_IDS,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(_MAX_RP_IDS_LENGTH), Some(crate::basis_change) Some(_MAX_RP_IDS_LENGTH), Some(crate::basis_change)
) { ) {
Ok(mut mrpli) => { Ok(mut mrpli) => {
@ -831,7 +832,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_PRIVATE_KEY, key::ATTESTATION_PRIVATE_KEY,
None, false, false, None, Some(crate::basis_change) Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false,
None, Some(crate::basis_change)
) { ) {
Ok(mut apk) => { Ok(mut apk) => {
let mut key = [0u8; key_material::ATTESTATION_PRIVATE_KEY_LENGTH]; let mut key = [0u8; key_material::ATTESTATION_PRIVATE_KEY_LENGTH];
@ -863,7 +865,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_PRIVATE_KEY, key::ATTESTATION_PRIVATE_KEY,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(key_material::ATTESTATION_PRIVATE_KEY_LENGTH), Some(crate::basis_change) Some(key_material::ATTESTATION_PRIVATE_KEY_LENGTH), Some(crate::basis_change)
) { ) {
Ok(mut apk) => { Ok(mut apk) => {
@ -882,7 +884,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
if let Some(mut acert) = self.pddb.borrow().get( if let Some(mut acert) = self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_CERTIFICATE, key::ATTESTATION_CERTIFICATE,
None, false, false, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false,
None, Some(crate::basis_change) None, Some(crate::basis_change)
).ok() { ).ok() {
let mut data = Vec::<u8>::new(); let mut data = Vec::<u8>::new();
@ -907,7 +909,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::ATTESTATION_CERTIFICATE, key::ATTESTATION_CERTIFICATE,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(1024), Some(crate::basis_change) Some(1024), Some(crate::basis_change)
) { ) {
Ok(mut acert) => { Ok(mut acert) => {
@ -926,7 +928,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
if let Some(mut guid) = self.pddb.borrow().get( if let Some(mut guid) = self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::AAGUID, key::AAGUID,
None, false, false, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, false,
None, Some(crate::basis_change) None, Some(crate::basis_change)
).ok() { ).ok() {
let mut data = [0u8; key_material::AAGUID_LENGTH]; let mut data = [0u8; key_material::AAGUID_LENGTH];
@ -952,7 +954,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
match self.pddb.borrow().get( match self.pddb.borrow().get(
FIDO_PERSISTENT_DICT, FIDO_PERSISTENT_DICT,
key::AAGUID, key::AAGUID,
None, false, true, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS), false, true,
Some(key_material::AAGUID_LENGTH), Some(crate::basis_change) Some(key_material::AAGUID_LENGTH), Some(crate::basis_change)
) { ) {
Ok(mut guid) => { Ok(mut guid) => {
@ -970,27 +972,29 @@ openssl asn1parse -in opensk_cert.pem -inform pem
/// ///
/// In particular persistent entries are not reset. /// In particular persistent entries are not reset.
pub fn reset(&mut self, _rng: &mut impl Rng256) -> Result<(), Ctap2StatusCode> { pub fn reset(&mut self, _rng: &mut impl Rng256) -> Result<(), Ctap2StatusCode> {
match self.pddb.borrow().delete_dict(FIDO_DICT, None) { match self.pddb.borrow().delete_dict(FIDO_DICT, Some(pddb::PDDB_DEFAULT_SYSTEM_BASIS)) {
Err(e) => match e.kind() {
std::io::ErrorKind::NotFound => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error
}
Ok(_) => Ok(()),
}?;
match self.pddb.borrow().delete_dict(FIDO_CRED_DICT, None) {
Err(e) => match e.kind() {
std::io::ErrorKind::NotFound => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error
}
Ok(_) => Ok(()),
}?;
match self.pddb.borrow().delete_dict(crate::fido::U2F_APP_DICT, None) {
Err(e) => match e.kind() { Err(e) => match e.kind() {
std::io::ErrorKind::NotFound => Ok(()), std::io::ErrorKind::NotFound => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error
} }
Ok(_) => Ok(()), Ok(_) => Ok(()),
}?; }?;
for basis in self.pddb.borrow().list_basis().iter () {
match self.pddb.borrow().delete_dict(FIDO_CRED_DICT, Some(basis)) {
Err(e) => match e.kind() {
std::io::ErrorKind::NotFound => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error
}
Ok(_) => Ok(()),
}?;
match self.pddb.borrow().delete_dict(crate::fido::U2F_APP_DICT, Some(basis)) {
Err(e) => match e.kind() {
std::io::ErrorKind::NotFound => Ok(()),
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), // PDDB internal error
}
Ok(_) => Ok(()),
}?;
}
// don't delete the persistent dictionary... // don't delete the persistent dictionary...
self.init()?; self.init()?;
Ok(()) Ok(())

View file

@ -107,6 +107,10 @@ To clear test entries:
pddb dictdelete vault.totp pddb dictdelete vault.totp
pddb dictdelete fido.cred pddb dictdelete fido.cred
pddb dictdelete fido.u2fapps pddb dictdelete fido.u2fapps
Issue: editing an entry in a non-secret basis while a secret basis is open won't work because
the delete key function doesn't work in that case. Need to modify the `get` routine to return
the basis so we can specify which basis to edit...
*/ */
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]