Skip to content

permission signing should use permissions_ca #204

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
mikaelarguedas merged 1 commit into from
May 1, 2020
Merged

permission signing should use permissions_ca #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion sros2/sros2/api/_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ def create_key(keystore_path, identity):
_permission.create_permission_file(permissions_path, _utilities.domain_id(), policy_element)

signed_permissions_path = os.path.join(key_dir, 'permissions.p7s')
keystore_permissions_ca_cert_path = os.path.join(
_keystore.get_keystore_public_dir(keystore_path), 'permissions_ca.cert.pem')
keystore_permissions_ca_key_path = os.path.join(
_keystore.get_keystore_private_dir(keystore_path), 'permissions_ca.key.pem')
_utilities.create_smime_signed_file(
keystore_ca_cert_path,
keystore_permissions_ca_cert_path,
keystore_permissions_ca_key_path,
permissions_path,
signed_permissions_path
Expand Down
14 changes: 9 additions & 5 deletions sros2/sros2/api/_permission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,16 @@ def create_permissions_from_policy_element(keystore_path, identity, policy_eleme
create_permission_file(permissions_path, _utilities.domain_id(), policy_element)

signed_permissions_path = os.path.join(key_dir, 'permissions.p7s')
keystore_ca_cert_path = os.path.join(
_keystore.get_keystore_public_dir(keystore_path), 'ca.cert.pem')
keystore_ca_key_path = os.path.join(
_keystore.get_keystore_private_dir(keystore_path), 'ca.key.pem')
keystore_permissions_ca_cert_path = os.path.join(
_keystore.get_keystore_public_dir(keystore_path), 'permissions_ca.cert.pem')
keystore_permissions_ca_key_path = os.path.join(
_keystore.get_keystore_private_dir(keystore_path), 'permissions_ca.key.pem')
_utilities.create_smime_signed_file(
keystore_ca_cert_path, keystore_ca_key_path, permissions_path, signed_permissions_path)
keystore_permissions_ca_cert_path,
keystore_permissions_ca_key_path,
permissions_path,
signed_permissions_path
)


def create_permission_file(path, domain_id, policy_element):
Expand Down