Skip to content

Commit d72a4ba

Browse files
cpfistercpfister
committed
Release 1.2.2
1 parent 4369c94 commit d72a4ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+4478
-1481
lines changed

‎CHANGELOG.md

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,30 @@
11
# Oberon PSA Crypto change log
22

3+
Oberon PSA Crypto 1.2.2
4+
<https://github.com/oberon-microsystems/oberon-psa-crypto-nrf/releases/tag/v1.2.2>
5+
6+
5-Mar-2024 (75c7949)
7+
8+
Oberon crypto software drivers require _ocrypto_ version 3.5.x.
9+
10+
### Breaking Changes
11+
- Implement new PAKE extension version 1.2 of PSA Certified Crypto API.
12+
- Implement PAKE PSA driver API according to new PAKE extension.
13+
- Implement SRP-6 according to new PSA Certified Crypto 1.2 PAKE extension.
14+
15+
### Improvements
16+
- Add tests for new PAKE extension version 1.2 of PSA Certified Crypto API.
17+
- Add random injection option in driver wrapper for PAKE tests to enable
18+
provided test vectors.
19+
- Use Mbed TLS alias for psa_key_id_t to prevent naming conflicts in TF-M.
20+
- Add redundant local variable initializations in Oberon drivers to avoid
21+
compiler warnings.
22+
- Update Copyright year in license.
23+
24+
--------------------------------------------------------------------------------
25+
326
## Oberon PSA Crypto 1.2.1
4-
https://github.com/oberon-microsystems/oberon-psa-crypto-nrf/releases/tag/rel1.2.1
27+
https://github.com/oberon-microsystems/oberon-psa-crypto-nrf/releases/tag/v1.2.1
528

629
25-Jan-2024 (7462663)
730

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LicenseID: LicenseRef-Nordic-5-Clause
22

33
Copyright (c) 2016 - 2024 Nordic Semiconductor ASA
4-
Copyright (c) since 2013 Oberon microsystems AG
4+
Copyright (c) since 2020 Oberon microsystems AG
55

66
All rights reserved.
77

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.1 25-Jan-2024 7462663
1+
1.2.2 5-Mar-2024 75c7949

‎include/psa/crypto.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3881,7 +3881,7 @@ psa_status_t psa_key_derivation_verify_bytes(
38813881
*/
38823882
psa_status_t psa_key_derivation_verify_key(
38833883
psa_key_derivation_operation_t *operation,
3884-
psa_key_id_t expected);
3884+
mbedtls_svc_key_id_t expected);
38853885

38863886
/** Abort a key derivation operation.
38873887
*

‎include/psa/crypto_adjust_config_key_pair_types.h

+22
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@
5656
#define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC 1
5757
#endif
5858

59+
#if defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_IMPORT) || \
60+
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_EXPORT) || \
61+
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_GENERATE) || \
62+
defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE)
63+
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC 1
64+
#endif
65+
66+
#if defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_IMPORT) || \
67+
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_EXPORT) || \
68+
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_GENERATE) || \
69+
defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_DERIVE)
70+
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC 1
71+
#endif
72+
5973
/*****************************************************************
6074
* BASIC -> corresponding PUBLIC
6175
****************************************************************/
@@ -72,4 +86,12 @@
7286
#define PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY 1
7387
#endif
7488

89+
#if defined(PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC)
90+
#define PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY 1
91+
#endif
92+
93+
#if defined(PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC)
94+
#define PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY 1
95+
#endif
96+
7597
#endif /* PSA_CRYPTO_ADJUST_KEYPAIR_TYPES_H */

‎include/psa/crypto_config.h

+16-1
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@
7777
#define PSA_WANT_ALG_SHA3_384 1
7878
#define PSA_WANT_ALG_SHA3_512 1
7979
#define PSA_WANT_ALG_SHAKE256_512 1
80-
#define PSA_WANT_ALG_SPAKE2P 1
80+
#define PSA_WANT_ALG_SPAKE2P_HMAC 1
81+
#define PSA_WANT_ALG_SPAKE2P_CMAC 1
82+
#define PSA_WANT_ALG_SPAKE2P_MATTER 1
8183
#define PSA_WANT_ALG_SRP_6 1
84+
#define PSA_WANT_ALG_SRP_PASSWORD_HASH 1
8285
#define PSA_WANT_ALG_STREAM_CIPHER 1
8386
#define PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS 1
8487
#define PSA_WANT_ALG_TLS12_PRF 1
@@ -106,6 +109,8 @@
106109
#define PSA_WANT_KEY_TYPE_RAW_DATA 1
107110
//#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR 1 /* Deprecated */
108111
#define PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY 1
112+
#define PSA_WANT_KEY_TYPE_SPAKE2P_PUBLIC_KEY 1
113+
#define PSA_WANT_KEY_TYPE_SRP_PUBLIC_KEY 1
109114

110115
#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1
111116
#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1
@@ -117,6 +122,16 @@
117122
#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT 1
118123
#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT 1
119124

125+
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_BASIC 1
126+
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_IMPORT 1
127+
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_EXPORT 1
128+
#define PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE 1
129+
130+
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_BASIC 1
131+
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_IMPORT 1
132+
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_EXPORT 1
133+
#define PSA_WANT_KEY_TYPE_SRP_KEY_PAIR_DERIVE 1
134+
120135
// Additional AES key size option
121136
#define PSA_WANT_AES_KEY_SIZE_128 1
122137
#define PSA_WANT_AES_KEY_SIZE_192 1

0 commit comments

Comments
 (0)