Crypto Service - keys access control #9638

itayzafrir · 2019-02-07T15:14:54Z

Description

Access control for crypto keys in crypto service.

This is in continuation of PR #9575 which ensured that only the key creator is allowed to open a key & obtain a handle to it.

This PR, validates that the psa_key_handle_t argument (passed in as an input argument to the crypto APIs) is associated with the calling partition, i.e. that the API caller is also the key owner/creator.

~~Please do not merge or run CI - needs preceding PR #9575~~

Reviewers, reviews should start from c9130428951d60d865826e431eb400d92223b163, previous commits are from #9575 and are being reviewed there.

Pull request type

[ ] Fix
[ ] Refactor
[ ] Target update
[X] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@avolinski

ciarmcom · 2019-02-07T16:00:39Z

@itayzafrir, thank you for your changes.
@avolinski @ARMmbed/mbed-os-crypto @ARMmbed/mbed-os-maintainers please review.

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c

alekshex

part 0.5

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.h

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c

0xc0170 · 2019-02-12T12:43:27Z

components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_types.h

@@ -0,0 +1,5 @@
+#ifdef PSA_CRYPTO_SECURE


license header files in each file

@0xc0170 these files were introduced in PR #9575, the commits relevant to this PR start from c913042. I've added the license in #9575 (3bc5f90), this branch will be rebased once 9575 goes through.

cmonr · 2019-02-13T20:55:33Z

this branch will be rebased once #9575 goes through.

Just leaving a more visible note.

NirSonnenschein · 2019-02-18T10:01:36Z

@0xc0170 your review comment seems to be fixed, please re-review.
@ARMmbed/mbed-os-crypto - this PR has been opened for a while, please review or comment on why you aren't going to.

Will be rereviewed once rebased

itayzafrir · 2019-02-20T10:09:20Z

@avolinski rebased on master, please take another look

0xc0170 · 2019-02-20T10:17:02Z

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.h

+#include "psa_crypto_core.h"
+#include "crypto_platform.h"
+
+void psa_crypto_access_control_init(void);


these functions should contain documentation?

I don't think so, this is internal only. These could have been implemented as static functions in psa_crypto_partition.c...

we could use \internal or using _internal suffix in the header or at least a comment in this header file.

Even internal functions should have documentation, hidden from public (using #if !defined(DOXYGEN_ONLY)). IF you look at some drivers headers like SPI.h

Added in 5ac58b84dfa06f1c6cd76293dd4f01a5511124a0

itayzafrir · 2019-02-20T15:12:54Z

PSA spec suggests abort() should be called

@alzix it's been used like that repeatedly as of cf3fd85

alekshex · 2019-02-21T17:18:25Z

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c

-#define PSA_CRYPTO_ACCESS_CONTROL_RESET() (memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr)))
+static inline void psa_crypto_access_control_reset()
+{
+    memset(crypto_access_control_arr, 0, sizeof(crypto_access_control_arr));


isn't it
psa_crypto_access_control_reset();?

The macro was removed in 6475bc65d818fc9ff4fc6c2c02de3d1b7ecde24a in favor of the static inline function.

Implement crypto keys access control in crypto service: - Only the key owner (the partition which created the key) is allowed to manage (import/export/open/close/destroy/etc.) the key. - Only the key owner (the partition which created the key) is allowed to use the key handle for crypto operations which require a key handle.

This file is for internal use only.

itayzafrir · 2019-02-24T13:14:40Z

Rebased on master

NirSonnenschein · 2019-02-24T14:34:13Z

@0xc0170 @alzix @ARMmbed/mbed-os-crypto please review/re-review (rebased and comments addressed).

NirSonnenschein · 2019-02-26T12:54:17Z

removing @ARMmbed/mbed-os-crypto as a reviewer. if you would still like to review please do so ASAP

NirSonnenschein · 2019-02-26T13:05:32Z

@0xc0170 @alzix , please re-review after the rebase

0xc0170 · 2019-02-27T08:34:01Z

Please do not merge or run CI - needs preceding PR #9575

Merged, this should be ready for review and CI

itayzafrir · 2019-02-27T08:34:51Z

Merged, this should be ready for review and CI

Yes this is unblocked now

0xc0170 · 2019-02-27T08:47:47Z

CI started

mbed-ci · 2019-02-27T13:34:21Z

Test run: SUCCESS

Summary: 12 of 12 test jobs passed
Build number : 1
Build artifacts

0xc0170 · 2019-02-27T13:42:29Z

@alzix Happy with the latest update? This is ready to land otherwise

itayzafrir · 2019-02-27T13:43:26Z

Not sure about the availability of @alzix, he might be OOO for a while...

NirSonnenschein added do not merge needs: preceding PR labels Feb 7, 2019

ciarmcom requested review from alekshex and a team February 7, 2019 16:00

ciarmcom added the needs: review label Feb 7, 2019

alekshex reviewed Feb 7, 2019

View reviewed changes

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c Outdated Show resolved Hide resolved

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c Outdated Show resolved Hide resolved

alekshex reviewed Feb 7, 2019

View reviewed changes

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c Outdated Show resolved Hide resolved

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.c Show resolved Hide resolved

itayzafrir changed the title ~~WIP Crypto Service - keys access control~~ Crypto Service - keys access control Feb 10, 2019

alekshex reviewed Feb 10, 2019

View reviewed changes

alzix reviewed Feb 10, 2019

View reviewed changes

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_access_control.h Outdated Show resolved Hide resolved

alekshex suggested changes Feb 11, 2019

View reviewed changes

alekshex reviewed Feb 11, 2019

View reviewed changes

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c Show resolved Hide resolved

alekshex approved these changes Feb 12, 2019

View reviewed changes

0xc0170 previously requested changes Feb 12, 2019

View reviewed changes

cmonr added needs: work and removed needs: review labels Feb 12, 2019

NirSonnenschein added needs: review and removed needs: work labels Feb 18, 2019

itayzafrir force-pushed the crypto-access-control branch from 7e7f188 to 6475bc6 Compare February 20, 2019 10:07

0xc0170 reviewed Feb 20, 2019

View reviewed changes

NirSonnenschein added the release-version: 5.12.0-rc1 label Feb 20, 2019

itayzafrir mentioned this pull request Feb 20, 2019

Crypto Service - keys access control TESTS #9780

Merged

alekshex reviewed Feb 21, 2019

View reviewed changes

itayzafrir added 5 commits February 24, 2019 15:07

Change PSA_CRYPTO_ACCESS_CONTROL_RESET into static inline function

99032f6

Add SPM_PANIC macro for TARGET_TFM

672712c

Move include psa_crypto_core.h to C file

0c231b0

Add internal documentation to access control header file

37cc257

This file is for internal use only.

itayzafrir force-pushed the crypto-access-control branch from 5ac58b8 to 37cc257 Compare February 24, 2019 13:14

cmonr added risk: R risk: A and removed risk: R labels Feb 25, 2019

NirSonnenschein removed the request for review from a team February 26, 2019 12:53

NirSonnenschein approved these changes Feb 26, 2019

View reviewed changes

0xc0170 removed do not merge needs: preceding PR labels Feb 27, 2019

0xc0170 approved these changes Feb 27, 2019

View reviewed changes

0xc0170 added needs: CI and removed needs: review labels Feb 27, 2019

0xc0170 added ready for merge and removed needs: CI labels Feb 27, 2019

0xc0170 merged commit 7656891 into ARMmbed:master Feb 27, 2019

0xc0170 removed the ready for merge label Feb 27, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Crypto Service - keys access control #9638

Crypto Service - keys access control #9638

itayzafrir commented Feb 7, 2019 •

edited

ciarmcom commented Feb 7, 2019

alekshex left a comment

0xc0170 Feb 12, 2019

itayzafrir Feb 13, 2019

cmonr commented Feb 13, 2019 •

edited

NirSonnenschein commented Feb 18, 2019

itayzafrir commented Feb 20, 2019

0xc0170 Feb 20, 2019

itayzafrir Feb 20, 2019

0xc0170 Feb 20, 2019 •

edited

itayzafrir Feb 20, 2019

itayzafrir commented Feb 20, 2019 •

edited

alekshex Feb 21, 2019

itayzafrir Feb 24, 2019

itayzafrir commented Feb 24, 2019

NirSonnenschein commented Feb 24, 2019

NirSonnenschein commented Feb 26, 2019

NirSonnenschein commented Feb 26, 2019

0xc0170 commented Feb 27, 2019

Please do not merge or run CI - needs preceding PR #9575

itayzafrir commented Feb 27, 2019

0xc0170 commented Feb 27, 2019

mbed-ci commented Feb 27, 2019

0xc0170 commented Feb 27, 2019

itayzafrir commented Feb 27, 2019

Crypto Service - keys access control #9638

Crypto Service - keys access control #9638

Conversation

itayzafrir commented Feb 7, 2019 • edited

Description

Pull request type

Reviewers

ciarmcom commented Feb 7, 2019

alekshex left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cmonr commented Feb 13, 2019 • edited

NirSonnenschein commented Feb 18, 2019

itayzafrir commented Feb 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xc0170 Feb 20, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itayzafrir commented Feb 20, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itayzafrir commented Feb 24, 2019

NirSonnenschein commented Feb 24, 2019

NirSonnenschein commented Feb 26, 2019

NirSonnenschein commented Feb 26, 2019

0xc0170 commented Feb 27, 2019

Please do not merge or run CI - needs preceding PR #9575

itayzafrir commented Feb 27, 2019

0xc0170 commented Feb 27, 2019

mbed-ci commented Feb 27, 2019

0xc0170 commented Feb 27, 2019

itayzafrir commented Feb 27, 2019

itayzafrir commented Feb 7, 2019 •

edited

cmonr commented Feb 13, 2019 •

edited

0xc0170 Feb 20, 2019 •

edited

itayzafrir commented Feb 20, 2019 •

edited