Skip to content

Commit 79cf111

Browse files
hug-devhug-dev
committed
Prepare for next release
Signed-off-by: Hugues de Valon <hugues.devalon@arm.com>
1 parent b661fe0 commit 79cf111

17 files changed

+210
-237
lines changed

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "parsec-interface"
3-
version = "0.24.0"
3+
version = "0.25.0"
44
authors = ["Parsec Project Contributors"]
55
description = "Parsec interface library to communicate using the wire protocol"
66
license = "Apache-2.0"
@@ -23,7 +23,7 @@ prost = "0.6.1"
2323
arbitrary = { version = "0.4.6", features = ["derive"], optional = true }
2424
uuid = "0.8.1"
2525
log = "0.4.11"
26-
psa-crypto = { git = "https://github.com/parallaxsecond/rust-psa-crypto", rev = "8605006d34944fa880edd3d4d347f460c5585747", default-features = false }
26+
psa-crypto = { version = "0.9.0", default-features = false }
2727
zeroize = { version = "1.1.0", features = ["zeroize_derive"] }
2828
secrecy = { version = "0.7.0", features = ["serde"] }
2929
derivative = "2.1.1"

‎src/operations/psa_aead_decrypt.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ mod tests {
6767
use psa_crypto::types::algorithm::Aead;
6868

6969
fn get_attrs() -> Attributes {
70+
let mut usage_flags = UsageFlags::default();
71+
let _ = usage_flags.set_decrypt();
72+
7073
Attributes {
7174
lifetime: Lifetime::Persistent,
7275
key_type: Type::Aes,
7376
bits: 0,
7477
policy: Policy {
75-
usage_flags: UsageFlags {
76-
decrypt: true,
77-
..Default::default()
78-
},
78+
usage_flags,
7979
permitted_algorithms: Aead::AeadWithDefaultLengthTag(AeadWithDefaultLengthTag::Ccm)
8080
.into(),
8181
},
@@ -98,7 +98,7 @@ mod tests {
9898
#[test]
9999
fn cannot_decrypt() {
100100
let mut attrs = get_attrs();
101-
attrs.policy.usage_flags.decrypt = false;
101+
attrs.policy.usage_flags = UsageFlags::default();
102102
assert_eq!(
103103
(Operation {
104104
key_name: String::from("some key"),

‎src/operations/psa_aead_encrypt.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,14 @@ mod tests {
6767
use psa_crypto::types::algorithm::Aead;
6868

6969
fn get_attrs() -> Attributes {
70+
let mut usage_flags = UsageFlags::default();
71+
let _ = usage_flags.set_encrypt();
7072
Attributes {
7173
lifetime: Lifetime::Persistent,
7274
key_type: Type::Aes,
7375
bits: 0,
7476
policy: Policy {
75-
usage_flags: UsageFlags {
76-
encrypt: true,
77-
..Default::default()
78-
},
77+
usage_flags,
7978
permitted_algorithms: Aead::AeadWithDefaultLengthTag(AeadWithDefaultLengthTag::Ccm)
8079
.into(),
8180
},
@@ -98,7 +97,7 @@ mod tests {
9897
#[test]
9998
fn cannot_encrypt() {
10099
let mut attrs = get_attrs();
101-
attrs.policy.usage_flags.encrypt = false;
100+
attrs.policy.usage_flags = UsageFlags::default();
102101
assert_eq!(
103102
(Operation {
104103
key_name: String::from("some key"),

‎src/operations/psa_asymmetric_decrypt.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,14 @@ mod tests {
6868
use zeroize::Zeroizing;
6969

7070
fn get_attrs() -> Attributes {
71+
let mut usage_flags = UsageFlags::default();
72+
let _ = usage_flags.set_decrypt();
7173
Attributes {
7274
lifetime: Lifetime::Persistent,
7375
key_type: Type::RsaKeyPair,
7476
bits: 256,
7577
policy: Policy {
76-
usage_flags: UsageFlags {
77-
export: false,
78-
copy: false,
79-
cache: false,
80-
encrypt: false,
81-
decrypt: true,
82-
sign_message: false,
83-
verify_message: false,
84-
sign_hash: false,
85-
verify_hash: false,
86-
derive: false,
87-
},
78+
usage_flags,
8879
permitted_algorithms: AsymmetricEncryption::RsaPkcs1v15Crypt.into(),
8980
},
9081
}
@@ -105,7 +96,7 @@ mod tests {
10596
#[test]
10697
fn cannot_decrypt() {
10798
let mut attrs = get_attrs();
108-
attrs.policy.usage_flags.decrypt = false;
99+
attrs.policy.usage_flags = UsageFlags::default();
109100
assert_eq!(
110101
(Operation {
111102
key_name: String::from("some key"),

‎src/operations/psa_asymmetric_encrypt.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,14 @@ mod tests {
6363
use crate::operations::psa_key_attributes::{Lifetime, Policy, Type, UsageFlags};
6464

6565
fn get_attrs() -> Attributes {
66+
let mut usage_flags = UsageFlags::default();
67+
let _ = usage_flags.set_encrypt();
6668
Attributes {
6769
lifetime: Lifetime::Persistent,
6870
key_type: Type::RsaKeyPair,
6971
bits: 256,
7072
policy: Policy {
71-
usage_flags: UsageFlags {
72-
export: false,
73-
copy: false,
74-
cache: false,
75-
encrypt: true,
76-
decrypt: false,
77-
sign_message: false,
78-
verify_message: false,
79-
sign_hash: false,
80-
verify_hash: false,
81-
derive: false,
82-
},
73+
usage_flags,
8374
permitted_algorithms: AsymmetricEncryption::RsaPkcs1v15Crypt.into(),
8475
},
8576
}
@@ -100,7 +91,7 @@ mod tests {
10091
#[test]
10192
fn cannot_encrypt() {
10293
let mut attrs = get_attrs();
103-
attrs.policy.usage_flags.encrypt = false;
94+
attrs.policy.usage_flags = UsageFlags::default();
10495
assert_eq!(
10596
(Operation {
10697
key_name: String::from("some key"),

‎src/operations/psa_raw_key_agreement.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,16 @@ mod tests {
5656
use crate::requests::ResponseStatus;
5757

5858
fn get_attrs() -> Attributes {
59+
let mut usage_flags = UsageFlags::default();
60+
let _ = usage_flags.set_derive();
5961
Attributes {
6062
lifetime: Lifetime::Persistent,
6163
key_type: Type::EccKeyPair {
6264
curve_family: EccFamily::SecpR1,
6365
},
6466
bits: 256,
6567
policy: Policy {
66-
usage_flags: UsageFlags {
67-
export: false,
68-
copy: false,
69-
cache: false,
70-
encrypt: false,
71-
decrypt: false,
72-
sign_message: false,
73-
verify_message: false,
74-
sign_hash: false,
75-
verify_hash: false,
76-
derive: true,
77-
},
68+
usage_flags,
7869
permitted_algorithms: KeyAgreement::Raw(RawKeyAgreement::Ecdh).into(),
7970
},
8071
}
@@ -94,7 +85,7 @@ mod tests {
9485
#[test]
9586
fn cannot_derive() {
9687
let mut attrs = get_attrs();
97-
attrs.policy.usage_flags.derive = false;
88+
attrs.policy.usage_flags = UsageFlags::default();
9889
assert_eq!(
9990
(Operation {
10091
private_key_name: String::from("some key"),

‎src/operations/psa_sign_hash.rs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,17 @@ mod tests {
5555
use crate::operations::psa_key_attributes::{EccFamily, Lifetime, Policy, Type, UsageFlags};
5656

5757
fn get_attrs() -> Attributes {
58+
let mut usage_flags = UsageFlags::default();
59+
let _ = usage_flags.set_sign_hash();
60+
5861
Attributes {
5962
lifetime: Lifetime::Persistent,
6063
key_type: Type::EccKeyPair {
6164
curve_family: EccFamily::SecpR1,
6265
},
6366
bits: 256,
6467
policy: Policy {
65-
usage_flags: UsageFlags {
66-
export: false,
67-
copy: false,
68-
cache: false,
69-
encrypt: false,
70-
decrypt: false,
71-
sign_message: false,
72-
verify_message: false,
73-
sign_hash: true,
74-
verify_hash: false,
75-
derive: false,
76-
},
68+
usage_flags,
7769
permitted_algorithms: Algorithm::AsymmetricSignature(AsymmetricSignature::Ecdsa {
7870
hash_alg: Hash::Sha256.into(),
7971
}),
@@ -97,7 +89,7 @@ mod tests {
9789
#[test]
9890
fn cannot_sign() {
9991
let mut attrs = get_attrs();
100-
attrs.policy.usage_flags.sign_hash = false;
92+
attrs.policy.usage_flags = UsageFlags::default();
10193
assert_eq!(
10294
(Operation {
10395
key_name: String::from("some key"),

‎src/operations/psa_sign_message.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,16 @@ mod tests {
5151
use crate::requests::ResponseStatus;
5252

5353
fn get_attrs() -> Attributes {
54+
let mut usage_flags = UsageFlags::default();
55+
let _ = usage_flags.set_sign_hash();
5456
Attributes {
5557
lifetime: Lifetime::Persistent,
5658
key_type: Type::EccKeyPair {
5759
curve_family: EccFamily::SecpR1,
5860
},
5961
bits: 256,
6062
policy: Policy {
61-
usage_flags: UsageFlags {
62-
export: false,
63-
copy: false,
64-
cache: false,
65-
encrypt: false,
66-
decrypt: false,
67-
sign_message: true,
68-
verify_message: false,
69-
sign_hash: true,
70-
verify_hash: false,
71-
derive: false,
72-
},
63+
usage_flags,
7364
permitted_algorithms: Algorithm::AsymmetricSignature(AsymmetricSignature::Ecdsa {
7465
hash_alg: Hash::Sha256.into(),
7566
}),
@@ -93,8 +84,7 @@ mod tests {
9384
#[test]
9485
fn cannot_sign() {
9586
let mut attrs = get_attrs();
96-
attrs.policy.usage_flags.sign_hash = false;
97-
attrs.policy.usage_flags.sign_message = false;
87+
attrs.policy.usage_flags = UsageFlags::default();
9888
assert_eq!(
9989
(Operation {
10090
key_name: String::from("some key"),

‎src/operations/psa_verify_hash.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,16 @@ mod tests {
5555
use crate::operations::psa_key_attributes::{EccFamily, Lifetime, Policy, Type, UsageFlags};
5656

5757
fn get_attrs() -> Attributes {
58+
let mut usage_flags = UsageFlags::default();
59+
let _ = usage_flags.set_verify_hash();
5860
Attributes {
5961
lifetime: Lifetime::Persistent,
6062
key_type: Type::EccKeyPair {
6163
curve_family: EccFamily::SecpR1,
6264
},
6365
bits: 256,
6466
policy: Policy {
65-
usage_flags: UsageFlags {
66-
export: false,
67-
copy: false,
68-
cache: false,
69-
encrypt: false,
70-
decrypt: false,
71-
sign_message: false,
72-
verify_message: false,
73-
sign_hash: false,
74-
verify_hash: true,
75-
derive: false,
76-
},
67+
usage_flags,
7768
permitted_algorithms: Algorithm::AsymmetricSignature(AsymmetricSignature::Ecdsa {
7869
hash_alg: Hash::Sha256.into(),
7970
}),
@@ -98,7 +89,7 @@ mod tests {
9889
#[test]
9990
fn cannot_sign() {
10091
let mut attrs = get_attrs();
101-
attrs.policy.usage_flags.verify_hash = false;
92+
attrs.policy.usage_flags = UsageFlags::default();
10293
assert_eq!(
10394
(Operation {
10495
key_name: String::from("some key"),

‎src/operations/psa_verify_message.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,16 @@ mod tests {
5151
use crate::requests::ResponseStatus;
5252

5353
fn get_attrs() -> Attributes {
54+
let mut usage_flags = UsageFlags::default();
55+
let _ = usage_flags.set_verify_hash();
5456
Attributes {
5557
lifetime: Lifetime::Persistent,
5658
key_type: Type::EccKeyPair {
5759
curve_family: EccFamily::SecpR1,
5860
},
5961
bits: 256,
6062
policy: Policy {
61-
usage_flags: UsageFlags {
62-
export: false,
63-
copy: false,
64-
cache: false,
65-
encrypt: false,
66-
decrypt: false,
67-
sign_message: false,
68-
verify_message: true,
69-
sign_hash: false,
70-
verify_hash: true,
71-
derive: false,
72-
},
63+
usage_flags,
7364
permitted_algorithms: Algorithm::AsymmetricSignature(AsymmetricSignature::Ecdsa {
7465
hash_alg: Hash::Sha256.into(),
7566
}),
@@ -94,8 +85,7 @@ mod tests {
9485
#[test]
9586
fn cannot_sign() {
9687
let mut attrs = get_attrs();
97-
attrs.policy.usage_flags.verify_hash = false;
98-
attrs.policy.usage_flags.verify_message = false;
88+
attrs.policy.usage_flags = UsageFlags::default();
9989
assert_eq!(
10090
(Operation {
10191
key_name: String::from("some key"),

0 commit comments

Comments
 (0)