mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
move the FIDO random secret into the FIDO_DICT
originally we stuck it in the CRED_DICT because it forces its creation -- but there's no reason to *really* do that. We just set the dictionary to be created if it's not existent in the later API calls. By moving this to FIDO_DICT instead of FIDO_CRED_DICT it makes key access & sorting much cleaner in the UX, because you don't have this odd key hanging out, and it also means that you can't have an attack on the system where you try to name a key with the name held in FIDO_CRED_DICT to try and read it out.
This commit is contained in:
parent
5e08941950
commit
512f435b2a
1 changed files with 7 additions and 12 deletions
|
|
@ -43,7 +43,7 @@ use super::CREDENTIAL_ID_SIZE;
|
|||
/// credentials, but what happens in this case is just a re-allocation in the PDDB.
|
||||
/// Whereas if this number is "too big" you end up with wasted space. I think a
|
||||
/// typical record will be around 300-400 bytes, so, this is a good compromise.
|
||||
const CRED_INITAL_SIZE: usize = 512;
|
||||
pub(crate) const CRED_INITAL_SIZE: usize = 512;
|
||||
|
||||
// Those constants may be modified before compilation to tune the behavior of the key.
|
||||
//
|
||||
|
|
@ -149,10 +149,8 @@ impl PersistentStore {
|
|||
}
|
||||
|
||||
// Generate and store the CredRandom secrets if they are missing.
|
||||
// note this goes into the FIDO_CRED_DICT, in order to force its creation.
|
||||
// It does mean we have a special case key in the dictionary.
|
||||
match self.pddb.borrow().get(
|
||||
FIDO_CRED_DICT,
|
||||
FIDO_DICT,
|
||||
key::CRED_RANDOM_SECRET,
|
||||
None, true, true,
|
||||
Some(64), Some(crate::basis_change)
|
||||
|
|
@ -387,7 +385,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
match self.pddb.borrow().get(
|
||||
FIDO_CRED_DICT,
|
||||
&shortid,
|
||||
None, false, false,
|
||||
None, true, false,
|
||||
Some(CREDENTIAL_ID_SIZE), Some(crate::basis_change)
|
||||
) {
|
||||
Ok(mut cred) => {
|
||||
|
|
@ -431,7 +429,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
match self.pddb.borrow().get(
|
||||
FIDO_CRED_DICT,
|
||||
&shortid,
|
||||
None, false, true,
|
||||
None, true, true,
|
||||
Some(CRED_INITAL_SIZE), Some(crate::basis_change)
|
||||
) {
|
||||
Ok(mut cred) => {
|
||||
|
|
@ -457,7 +455,6 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
let mut result = Vec::<PublicKeyCredentialSource>::new();
|
||||
let mut cred_list = self.pddb.borrow().list_keys(
|
||||
FIDO_CRED_DICT, None).or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
|
||||
cred_list.retain(|name| name != key::CRED_RANDOM_SECRET); // don't try to investigate this one key
|
||||
for cred_name in cred_list.iter() {
|
||||
if let Some(mut cred_entry) = self.pddb.borrow().get(
|
||||
FIDO_CRED_DICT,
|
||||
|
|
@ -483,7 +480,6 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
pub fn count_credentials(&self) -> Result<usize, Ctap2StatusCode> {
|
||||
let mut cred_list = self.pddb.borrow().list_keys(
|
||||
FIDO_CRED_DICT, None).or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
|
||||
cred_list.retain(|name| name != key::CRED_RANDOM_SECRET); // don't count this special case key
|
||||
Ok(cred_list.len())
|
||||
}
|
||||
|
||||
|
|
@ -492,7 +488,6 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
let mut max = 0;
|
||||
let mut cred_list = self.pddb.borrow().list_keys(
|
||||
FIDO_CRED_DICT, None).or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
|
||||
cred_list.retain(|name| name != key::CRED_RANDOM_SECRET); // don't try to investigate this one key
|
||||
if cred_list.len() == 0 {
|
||||
return Ok(0)
|
||||
}
|
||||
|
|
@ -588,7 +583,7 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
/// Returns the CredRandom secret.
|
||||
pub fn cred_random_secret(&self, has_uv: bool) -> Result<[u8; 32], Ctap2StatusCode> {
|
||||
match self.pddb.borrow().get(
|
||||
FIDO_CRED_DICT,
|
||||
FIDO_DICT,
|
||||
key::CRED_RANDOM_SECRET,
|
||||
None, false, false, None, Some(crate::basis_change)
|
||||
) {
|
||||
|
|
@ -1000,13 +995,13 @@ openssl asn1parse -in opensk_cert.pem -inform pem
|
|||
}
|
||||
|
||||
/// Deserializes a credential from storage representation.
|
||||
fn deserialize_credential(data: &[u8]) -> Option<PublicKeyCredentialSource> {
|
||||
pub(crate) fn deserialize_credential(data: &[u8]) -> Option<PublicKeyCredentialSource> {
|
||||
let cbor = cbor::read(data).ok()?;
|
||||
cbor.try_into().ok()
|
||||
}
|
||||
|
||||
/// Serializes a credential to storage representation.
|
||||
fn serialize_credential(credential: PublicKeyCredentialSource) -> Result<Vec<u8>, Ctap2StatusCode> {
|
||||
pub(crate) fn serialize_credential(credential: PublicKeyCredentialSource) -> Result<Vec<u8>, Ctap2StatusCode> {
|
||||
let mut data = Vec::new();
|
||||
if cbor::write(credential.into(), &mut data) {
|
||||
Ok(data)
|
||||
|
|
|
|||
Loading…
Reference in a new issue