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

Merge branch 'develop' into ed25519

Browse Source
This commit is contained in:
egor-duda
2022-05-19 22:58:02 +03:00
committed by GitHub
parent 9d36da16c7 7b872df01e
commit 9a9d68ec41
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/crypto/Cargo.toml
View File

@@ -10,7 +10,6 @@ license = "Apache-2.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
libtock_drivers = { path = "../../third_party/libtock-drivers" }
rng256 = { path = "../rng256" } rng256 = { path = "../rng256" }
arrayref = "0.3.6" arrayref = "0.3.6"
subtle = { version = "2.2.3", default-features = false, features = ["nightly"] } subtle = { version = "2.2.3", default-features = false, features = ["nightly"] }

4
src/ctap/crypto_wrapper.rs
View File

@@ -97,7 +97,9 @@ pub fn aes256_cbc_decrypt(
} }
/// An asymmetric private key that can sign messages. /// An asymmetric private key that can sign messages.
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug)]
// We shouldn't compare private keys in prod without constant-time operations.
#[cfg_attr(test, derive(PartialEq, Eq))]
pub enum PrivateKey { pub enum PrivateKey {
Ecdsa(ecdsa::SecKey), Ecdsa(ecdsa::SecKey),
#[cfg(feature = "ed25519")] #[cfg(feature = "ed25519")]

3
src/ctap/data_formats.rs
View File

@@ -577,7 +577,8 @@ impl TryFrom<cbor::Value> for CredentialProtectionPolicy {
// //
// Note that we only use the WebAuthn definition as an example. This data-structure is not specified // Note that we only use the WebAuthn definition as an example. This data-structure is not specified
// by FIDO. In particular we may choose how we serialize and deserialize it. // by FIDO. In particular we may choose how we serialize and deserialize it.
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug)]
#[cfg_attr(test, derive(PartialEq, Eq))]
pub struct PublicKeyCredentialSource { pub struct PublicKeyCredentialSource {
pub key_type: PublicKeyCredentialType, pub key_type: PublicKeyCredentialType,
pub credential_id: Vec<u8>, pub credential_id: Vec<u8>,