lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

Merge branch 'psa-derive_input_steps-agreement_as_one_step' into psa-api-1.0-beta

Browse Source 
Change the key derivation API to take inputs in multiple steps,
instead of a single one-site-fits-poorly function.

Conflicts:
* include/psa/crypto.h: merge independent changes in the documentation
  of psa_key_agreement (public_key from the work on public key formats
  vs general description and other parameters in the work on key derivation).
* tests/suites/test_suite_psa_crypto.data: update the key agreement
  tests from the work on key derivation to the format from the work on
  public key formats.
* tests/suites/test_suite_psa_crypto_metadata.function: reconcile the
  addition of unrelated ALG_IS_xxx macros
This commit is contained in:
Gilles Peskine
2019-01-18 18:51:30 +01:00
parent 7666edbfe1 6843c29713
commit 9dcc80e628
10 changed files with 753 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/psa/crypto_struct.h
View File

@@ -186,6 +186,8 @@ typedef struct
#endif
uint8_t offset_in_block;
uint8_t block_number;
uint8_t state : 2;
uint8_t info_set : 1;
} psa_hkdf_generator_t;
#endif /* MBEDTLS_MD_C */