Skip to content
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

Bring Oberon PSA core v1.2.1.1 #14136

Merged
merged 6 commits into from
Feb 28, 2024
Merged

Bring Oberon PSA core v1.2.1.1 #14136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67f629e
ext: oberon: Bring Oberon PSA core v1.2.1.1
Vge0rge Feb 21, 2024
cd21b10
nrf_security: Adapt to Oberon PSA core v1.2.1.1
Vge0rge Feb 21, 2024
542b723
manifest: Bring Zephyr changes for Oberon PSA core
Vge0rge Feb 22, 2024
83f429f
samples: ecjpake: Adapt to PSA crypto spec 1.2 PAKE APIs
mswarowsky Feb 22, 2024
1739cf5
manifest: mbedtls: Adapt to final PAKE APIs
mswarowsky Feb 23, 2024
f8d882a
manifest: Bring Matter with new PAKE APIs
Vge0rge Feb 26, 2024
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
24 changes: 15 additions & 9 deletions doc/nrf/libraries/nrf_security/doc/driver_config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,15 +727,21 @@ Password-authenticated key exchange configurations

To enable password-authenticated key exchange (PAKE) support, set one or more of the Kconfig options in the following table:

+-----------------------+-----------------------------------------------+
| PAKE algorithm | Configuration option |
+=======================+===============================================+
| EC J-PAKE | :kconfig:option:`CONFIG_PSA_WANT_ALG_JPAKE` |
+-----------------------+-----------------------------------------------+
| SPAKE2+ | :kconfig:option:`CONFIG_PSA_WANT_ALG_SPAKE2P` |
+-----------------------+-----------------------------------------------+
| SRP-6 | :kconfig:option:`CONFIG_PSA_WANT_ALG_SRP_6` |
+-----------------------+-----------------------------------------------+
+------------------------+------------------------------------------------------+
| PAKE algorithm | Configuration option |
+========================+======================================================+
| EC J-PAKE | :kconfig:option:`CONFIG_PSA_WANT_ALG_JPAKE` |
+------------------------+------------------------------------------------------+
| SPAKE2+ with HMAC | :kconfig:option:`CONFIG_PSA_WANT_ALG_SPAKE2P_HMAC` |
+------------------------+------------------------------------------------------+
| SPAKE2+ with CMAC | :kconfig:option:`CONFIG_PSA_WANT_ALG_SPAKE2P_CMAC` |
+------------------------+------------------------------------------------------+
| SPAKE2+ for Matter | :kconfig:option:`CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER` |
+------------------------+------------------------------------------------------+
| SRP-6 | :kconfig:option:`CONFIG_PSA_WANT_ALG_SRP_6` |
+------------------------+------------------------------------------------------+
| SRP-6 password hashing | :kconfig:option:`CONFIG_PSA_WANT_ALG_SRP_6` |
+------------------------+------------------------------------------------------+

.. note::
* The provided support is experimental.
Expand Down
22 changes: 22 additions & 0 deletions ext/oberon/psa/core/include/psa/crypto_adjust_config_key_pair_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@
#define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC 1
#endif

#if defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_IMPORT) || \
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_EXPORT) || \
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_GENERATE) || \
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE)
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC 1
#endif

#if defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_IMPORT) || \
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_EXPORT) || \
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_GENERATE) || \
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_DERIVE)
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC 1
#endif

/*****************************************************************
* BASIC -> corresponding PUBLIC
****************************************************************/
Expand All @@ -72,4 +86,12 @@
#define PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY 1
#endif

#if defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC)
#define PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY 1
#endif

#if defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC)
#define PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY 1
#endif

#endif /* PSA_CRYPTO_ADJUST_KEYPAIR_TYPES_H */
Loading
Loading