Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 19 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion libwebauthn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async-trait = "0.1.36"
futures = "0.3.5"
tokio = { version = "1.45", features = ["full"] }
serde = "1.0.110"
serde_cbor = "0.11.2"
serde_cbor_2 = "0.13"
serde-indexed = "0.2.0"
serde_derive = "1.0.123"
serde_repr = "0.1.6"
Expand Down
1 change: 1 addition & 0 deletions libwebauthn/src/proto/ctap2/cbor/serde.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use serde::Serialize;
use serde_cbor_2 as serde_cbor;

#[derive(thiserror::Error, Debug)]
pub enum CborError {
Expand Down
2 changes: 2 additions & 0 deletions libwebauthn/src/proto/ctap2/model.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::pin::PinUvAuthProtocol;
use crate::proto::ctap1::Ctap1Transport;

use num_enum::{IntoPrimitive, TryFromPrimitive};
use serde_bytes::ByteBuf;
use serde_derive::{Deserialize, Serialize};
Expand Down Expand Up @@ -226,6 +227,7 @@ mod tests {
use super::{Ctap2COSEAlgorithmIdentifier, Ctap2CredentialType, Ctap2PublicKeyCredentialType};
use hex;
use serde_bytes::ByteBuf;
use serde_cbor_2 as serde_cbor;

#[test]
/// Verify CBOR serialization conforms to CTAP canonical standard, including ordering (see #95)
Expand Down
1 change: 1 addition & 0 deletions libwebauthn/src/transport/cable/tunnel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use p256::{ecdh, NonZeroScalar};
use p256::{PublicKey, SecretKey};
use serde::Deserialize;
use serde_bytes::ByteBuf;
use serde_cbor_2 as serde_cbor;
use serde_indexed::DeserializeIndexed;
use sha2::{Digest, Sha256};
use snow::{Builder, TransportState};
Expand Down
Loading