Skip to content

Commit 69642f6

Browse files
ionut-armionut-arm
committed
Remove CAL from all-providers
Since the `rust-cryptoauthlib` crate isn't currently maintained, and given that it seems to have some issues with cross-compilation for armv7, we're removing the CAL provider from `all-providers` until we can get it properly built and maintained. Signed-off-by: Ionut Mihalcea <[email protected]>
1 parent 89de1b2 commit 69642f6

File tree

7 files changed

+62
-51
lines changed

7 files changed

+62
-51
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pkcs11-provider = ["cryptoki", "picky-asn1-der", "picky-asn1", "picky-asn1-x509"
7070
tpm-provider = ["tss-esapi", "picky-asn1-der", "picky-asn1", "picky-asn1-x509", "hex"]
7171
cryptoauthlib-provider = ["rust-cryptoauthlib"]
7272
trusted-service-provider = ["psa-crypto", "bindgen", "prost-build", "prost"]
73-
all-providers = ["tpm-provider", "pkcs11-provider", "mbed-crypto-provider", "cryptoauthlib-provider", "trusted-service-provider"]
73+
all-providers = ["tpm-provider", "pkcs11-provider", "mbed-crypto-provider", "trusted-service-provider"]
7474

7575
# Authenticators
7676
direct-authenticator = []

‎e2e_tests/provider_cfg/all/config.toml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ user_pin = "123456"
4040
# The slot_number mandatory field is going to replace the following line with a valid number
4141
# slot_number
4242

43-
[[provider]]
44-
provider_type = "CryptoAuthLib"
45-
key_info_manager = "sqlite-manager"
46-
device_type = "always-success"
47-
iface_type = "test-interface"
43+
44+
# CAL provider and hardware abstraction crate are unmaintained; See #585
45+
# [[provider]]
46+
# provider_type = "CryptoAuthLib"
47+
# key_info_manager = "sqlite-manager"
48+
# device_type = "always-success"
49+
# iface_type = "test-interface"
4850
# wake_delay = 1500
4951
# rx_retries = 20
5052
# # i2c parameters for i2c-pseudo proxy

‎e2e_tests/provider_cfg/all/on-disk-kim-all-providers.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ user_pin = "123456"
4040
# The slot_number mandatory field is going to replace the following line with a valid number
4141
# slot_number
4242

43-
[[provider]]
44-
provider_type = "CryptoAuthLib"
45-
key_info_manager = "on-disk-manager"
46-
device_type = "always-success"
47-
iface_type = "test-interface"
43+
# CAL provider and hardware abstraction crate are unmaintained; See #585
44+
# [[provider]]
45+
# provider_type = "CryptoAuthLib"
46+
# key_info_manager = "on-disk-manager"
47+
# device_type = "always-success"
48+
# iface_type = "test-interface"
4849
# wake_delay = 1500
4950
# rx_retries = 20
5051
# # i2c parameters for i2c-pseudo proxy

‎e2e_tests/tests/all_providers/config/mod.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ fn list_providers() {
6262
Uuid::parse_str("1c1139dc-ad7c-47dc-ad6b-db6fdb466552").unwrap(), // Mbed crypto provider
6363
Uuid::parse_str("1e4954a4-ff21-46d3-ab0c-661eeb667e1d").unwrap(), // Tpm provider
6464
Uuid::parse_str("30e39502-eba6-4d60-a4af-c518b7f5e38f").unwrap(), // Pkcs11 provider
65-
Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap(), // CryptoAuthLib provider
65+
// CAL provider and hardware abstraction crate are unmaintained; See #585
66+
// Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap(), // CryptoAuthLib provider
6667
Uuid::parse_str("47049873-2a43-4845-9d72-831eab668784").unwrap(), // Core provider
6768
]
6869
);
@@ -78,7 +79,8 @@ fn list_providers() {
7879
Uuid::parse_str("30e39502-eba6-4d60-a4af-c518b7f5e38f").unwrap(), // Pkcs11 provider
7980
Uuid::parse_str("1c1139dc-ad7c-47dc-ad6b-db6fdb466552").unwrap(), // Mbed crypto provider
8081
Uuid::parse_str("1e4954a4-ff21-46d3-ab0c-661eeb667e1d").unwrap(), // Tpm provider
81-
Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap(), // CryptoAuthLib provider
82+
// CAL provider and hardware abstraction crate are unmaintained; See #585
83+
// Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap(), // CryptoAuthLib provider
8284
Uuid::parse_str("47049873-2a43-4845-9d72-831eab668784").unwrap(), // Core provider
8385
]
8486
);

‎e2e_tests/tests/all_providers/config/tomls/list_providers_1.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ user_pin = "123456"
3434
# The slot_number mandatory field is going to replace the following line with a valid number
3535
# slot_number
3636

37-
[[provider]]
38-
provider_type = "CryptoAuthLib"
39-
key_info_manager = "sqlite-manager"
40-
device_type = "always-success"
41-
iface_type = "test-interface"
42-
wake_delay = 1500
43-
rx_retries = 20
44-
# i2c parameters for i2c-pseudo proxy
45-
slave_address = 0xc0
46-
bus = 1
47-
baud = 400000
37+
# CAL provider and hardware abstraction crate are unmaintained; See #585
38+
# [[provider]]
39+
# provider_type = "CryptoAuthLib"
40+
# key_info_manager = "sqlite-manager"
41+
# device_type = "always-success"
42+
# iface_type = "test-interface"
43+
# wake_delay = 1500
44+
# rx_retries = 20
45+
# # i2c parameters for i2c-pseudo proxy
46+
# slave_address = 0xc0
47+
# bus = 1
48+
# baud = 400000

‎e2e_tests/tests/all_providers/config/tomls/list_providers_2.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ key_info_manager = "sqlite-manager"
3434
tcti = "mssim"
3535
owner_hierarchy_auth = "tpm_pass"
3636

37-
[[provider]]
38-
provider_type = "CryptoAuthLib"
39-
key_info_manager = "sqlite-manager"
40-
device_type = "always-success"
41-
iface_type = "test-interface"
42-
wake_delay = 1500
43-
rx_retries = 20
44-
# i2c parameters for i2c-pseudo proxy
45-
slave_address = 0xc0
46-
bus = 1
47-
baud = 400000
37+
# CAL provider and hardware abstraction crate are unmaintained; See #585
38+
# [[provider]]
39+
# provider_type = "CryptoAuthLib"
40+
# key_info_manager = "sqlite-manager"
41+
# device_type = "always-success"
42+
# iface_type = "test-interface"
43+
# wake_delay = 1500
44+
# rx_retries = 20
45+
# # i2c parameters for i2c-pseudo proxy
46+
# slave_address = 0xc0
47+
# bus = 1
48+
# baud = 400000

‎e2e_tests/tests/all_providers/normal.rs‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::iter::FromIterator;
1515
fn list_providers() {
1616
let mut client = TestClient::new();
1717
let providers = client.list_providers().expect("list providers failed");
18-
assert_eq!(providers.len(), 5);
18+
assert_eq!(providers.len(), 4);
1919
let uuids: HashSet<Uuid> = providers.iter().map(|p| p.uuid).collect();
2020
// Core provider
2121
assert!(uuids.contains(&Uuid::parse_str("47049873-2a43-4845-9d72-831eab668784").unwrap()));
@@ -25,8 +25,9 @@ fn list_providers() {
2525
assert!(uuids.contains(&Uuid::parse_str("30e39502-eba6-4d60-a4af-c518b7f5e38f").unwrap()));
2626
// TPM provider
2727
assert!(uuids.contains(&Uuid::parse_str("1e4954a4-ff21-46d3-ab0c-661eeb667e1d").unwrap()));
28-
// CryptoAuthLib provider
29-
assert!(uuids.contains(&Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap()));
28+
// CAL provider and hardware abstraction crate are unmaintained; See #585
29+
// // CryptoAuthLib provider
30+
// assert!(uuids.contains(&Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap()));
3031
}
3132

3233
#[test]
@@ -45,12 +46,13 @@ fn list_providers_order_respected() {
4546
providers[2].uuid,
4647
Uuid::parse_str("30e39502-eba6-4d60-a4af-c518b7f5e38f").unwrap()
4748
);
49+
// CAL provider and hardware abstraction crate are unmaintained; See #585
50+
// assert_eq!(
51+
// providers[3].uuid,
52+
// Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap()
53+
// );
4854
assert_eq!(
4955
providers[3].uuid,
50-
Uuid::parse_str("b8ba81e2-e9f7-4bdd-b096-a29d0019960c").unwrap()
51-
);
52-
assert_eq!(
53-
providers[4].uuid,
5456
Uuid::parse_str("47049873-2a43-4845-9d72-831eab668784").unwrap()
5557
);
5658
}
@@ -101,9 +103,10 @@ fn list_opcodes() {
101103

102104
let core_provider_opcodes = HashSet::from_iter(core_opcodes);
103105

104-
let mut crypto_providers_cal = HashSet::new();
105-
// Not that much to be tested with test-interface
106-
let _ = crypto_providers_cal.insert(Opcode::PsaGenerateRandom);
106+
// CAL provider and hardware abstraction crate are unmaintained; See #585
107+
// let mut crypto_providers_cal = HashSet::new();
108+
// // Not that much to be tested with test-interface
109+
// let _ = crypto_providers_cal.insert(Opcode::PsaGenerateRandom);
107110

108111
let mut crypto_providers_tpm = HashSet::from_iter(common_opcodes.clone());
109112
let _ = crypto_providers_tpm.insert(Opcode::CanDoCrypto);
@@ -139,12 +142,13 @@ fn list_opcodes() {
139142
.expect("list providers failed"),
140143
crypto_providers_mbed_crypto
141144
);
142-
assert_eq!(
143-
client
144-
.list_opcodes(ProviderId::CryptoAuthLib)
145-
.expect("list providers failed"),
146-
crypto_providers_cal
147-
);
145+
// CAL provider and hardware abstraction crate are unmaintained; See #585
146+
// assert_eq!(
147+
// client
148+
// .list_opcodes(ProviderId::CryptoAuthLib)
149+
// .expect("list providers failed"),
150+
// crypto_providers_cal
151+
// );
148152
}
149153

150154
#[cfg(feature = "testing")]

0 commit comments

Comments
 (0)