Skip to content

Commit b2e490b

Browse files
Added missing attributes to templates for tests relating to multi-part operations
Signed-off-by: Jacob Prud'homme <2160185+jacobprudhomme@users.noreply.github.com>
1 parent 4d6b18e commit b2e490b

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

cryptoki/tests/basic.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ fn sign_verify_multipart() -> TestResult {
228228

229229
let pub_key_template = vec![
230230
Attribute::Token(true),
231+
Attribute::Private(false),
231232
Attribute::PublicExponent(public_exponent),
232233
Attribute::ModulusBits(modulus_bits.into()),
234+
Attribute::Verify(true),
233235
];
234-
let priv_key_template = vec![Attribute::Token(true)];
236+
let priv_key_template = vec![Attribute::Token(true), Attribute::Sign(true)];
235237

236238
// Generate keypair
237239
let (pub_key, priv_key) = session.generate_key_pair(
@@ -331,10 +333,12 @@ fn sign_verify_multipart_already_initialized() -> TestResult {
331333

332334
let pub_key_template = vec![
333335
Attribute::Token(true),
336+
Attribute::Private(false),
334337
Attribute::PublicExponent(public_exponent),
335338
Attribute::ModulusBits(modulus_bits.into()),
339+
Attribute::Verify(true),
336340
];
337-
let priv_key_template = vec![Attribute::Token(true)];
341+
let priv_key_template = vec![Attribute::Token(true), Attribute::Sign(true)];
338342

339343
// Generate keypair
340344
let (pub_key, priv_key) = session.generate_key_pair(
@@ -437,7 +441,10 @@ fn encrypt_decrypt_multipart() -> TestResult {
437441
// Generate key (currently SoftHSM only supports multi-part encrypt/decrypt for symmetric crypto)
438442
let template = vec![
439443
Attribute::Token(true),
444+
Attribute::Private(false),
440445
Attribute::ValueLen((128 / 8).into()),
446+
Attribute::Encrypt(true),
447+
Attribute::Decrypt(true),
441448
];
442449
let key = session.generate_key(&Mechanism::AesKeyGen, &template)?;
443450

@@ -539,7 +546,10 @@ fn encrypt_decrypt_multipart_already_initialized() -> TestResult {
539546
// Generate key (currently SoftHSM only supports multi-part encrypt/decrypt for symmetric crypto)
540547
let template = vec![
541548
Attribute::Token(true),
549+
Attribute::Private(false),
542550
Attribute::ValueLen((128 / 8).into()),
551+
Attribute::Encrypt(true),
552+
Attribute::Decrypt(true),
543553
];
544554
let key = session.generate_key(&Mechanism::AesKeyGen, &template)?;
545555

@@ -1655,6 +1665,7 @@ fn sha256_digest_multipart_with_key() -> TestResult {
16551665
// Create a key to add to the digest
16561666
let key_template = vec![
16571667
Attribute::Token(true),
1668+
Attribute::Private(false),
16581669
Attribute::ValueLen((256 / 8).into()),
16591670
// Key must be non-sensitive and extractable to get its bytes and digest them directly, for comparison
16601671
Attribute::Sensitive(false),

0 commit comments

Comments
 (0)