Skip to content

Allow generation of keys of different types in the same session #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthiasValvekens merged 3 commits into from
Apr 13, 2026
Merged

Allow generation of keys of different types in the same session #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2af5395
Fix bug 226
Legrandin Apr 12, 2026
ce3b5aa
Add regression test
Legrandin Apr 13, 2026
51bdf34
Fix ruff check
Legrandin Apr 13, 2026
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
4 changes: 2 additions & 2 deletions pkcs11/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def public_key_template(
label: str | None,
store: bool,
) -> dict[Attribute, Any]:
template = self.default_public_key_template
template = dict(self.default_public_key_template)
_apply_capabilities(
template, (Attribute.ENCRYPT, Attribute.WRAP, Attribute.VERIFY), capabilities
)
Expand All @@ -224,7 +224,7 @@ def private_key_template(
label: str | None,
store: bool,
) -> dict[Attribute, Any]:
template = self.default_private_key_template
template = dict(self.default_private_key_template)
_apply_capabilities(
template,
(Attribute.DECRYPT, Attribute.UNWRAP, Attribute.SIGN, Attribute.DERIVE),
Expand Down
65 changes: 65 additions & 0 deletions tests/test_attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
"""
PKCS#11 attribute mapper tests.
"""

import unittest

from pkcs11 import Attribute, MechanismFlag
from pkcs11.attributes import AttributeMapper


class AttributeMapperTests(unittest.TestCase):
def test_public_key_template_is_not_shared_between_calls(self):
mapper = AttributeMapper()

rsa_template = mapper.public_key_template(
capabilities=MechanismFlag.ENCRYPT | MechanismFlag.VERIFY,
id_=b"rsa",
label="rsa",
store=True,
)
rsa_template.update(
{
Attribute.PUBLIC_EXPONENT: b"\x01\x00\x01",
Attribute.MODULUS_BITS: 4096,
}
)

ec_template = mapper.public_key_template(
capabilities=MechanismFlag.VERIFY,
id_=b"ec",
label="ec",
store=False,
)

self.assertNotIn(Attribute.PUBLIC_EXPONENT, mapper.default_public_key_template)
self.assertNotIn(Attribute.MODULUS_BITS, mapper.default_public_key_template)
self.assertNotIn(Attribute.PUBLIC_EXPONENT, ec_template)
self.assertNotIn(Attribute.MODULUS_BITS, ec_template)
self.assertEqual(ec_template[Attribute.ID], b"ec")
self.assertEqual(ec_template[Attribute.LABEL], "ec")
self.assertFalse(ec_template[Attribute.TOKEN])

def test_private_key_template_is_not_shared_between_calls(self):
mapper = AttributeMapper()

rsa_template = mapper.private_key_template(
capabilities=MechanismFlag.DECRYPT | MechanismFlag.SIGN,
id_=b"rsa",
label="rsa",
store=True,
)
rsa_template[Attribute.EXTRACTABLE] = True

ec_template = mapper.private_key_template(
capabilities=MechanismFlag.SIGN | MechanismFlag.DERIVE,
id_=b"ec",
label="ec",
store=False,
)

self.assertNotIn(Attribute.EXTRACTABLE, mapper.default_private_key_template)
self.assertNotIn(Attribute.EXTRACTABLE, ec_template)
self.assertEqual(ec_template[Attribute.ID], b"ec")
self.assertEqual(ec_template[Attribute.LABEL], "ec")
self.assertFalse(ec_template[Attribute.TOKEN])
Loading