Skip to content

Bump serde-byte-array and change backend directory #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robin-nitrokey merged 2 commits into from
Mar 2, 2023
Merged

Bump serde-byte-array and change backend directory #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390a0f6
Update serde-byte-array
robin-nitrokey Mar 2, 2023
d01a95c
Flatten backend directory
robin-nitrokey Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "Authentication extension and backend for Trussed"

[dependencies]
serde = { version = "1", default-features = false }
serde-byte-array = "0.1.0"
serde-byte-array = "0.1.2"
sha2 = { version = "0.10.6", default-features = false }
subtle = { version = "2.4.1", default-features = false }
trussed = { git = "https://github.com/trussed-dev/trussed", rev = "1c55b3b2dd6a9e1cfc55758635baf0d0bbf387d1", features = ["serde-extensions"] }
Expand Down
6 changes: 3 additions & 3 deletions src/backend/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ impl<'a> PinDataMut<'a> {
return false;
}
let success = hash(self.id, pin, &self.salt)
.as_ref()
.ct_eq(self.hash.as_ref())
.as_slice()
.ct_eq(self.hash.as_slice())
.into();
if let Some(retries) = &mut self.data.retries {
if success {
Expand Down Expand Up @@ -173,7 +173,7 @@ fn hash(id: PinId, pin: &Pin, salt: &Salt) -> Hash {
digest.update([u8::from(id)]);
digest.update([pin_len(pin)]);
digest.update(pin);
digest.update(salt.as_ref());
digest.update(salt);
Hash::new(digest.finalize().into())
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub const MAX_PIN_LENGTH: usize = MAX_SHORT_DATA_LENGTH;
/// A PIN.
pub type Pin = Bytes<MAX_PIN_LENGTH>;

const PIN_PATH: &str = "backend/auth/pin";
const PIN_PATH: &str = "backend-auth/pin";

/// The ID of a PIN within the namespace of a client.
///
Expand Down