Merge pull request #165 from gilles-peskine-arm/storage_spec-1.1.0-release

Correct version number in storage format spec
This commit is contained in:
Jaeden Amero 2019-07-30 10:12:44 +01:00 committed by GitHub
commit aad3dabd2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -161,21 +161,21 @@ The library integration and the PSA platform integration use different sets of f
It would simplify things to always have a 32-bit owner, with a nonzero value, and thus reserve the range 00xffffffff for internal library use. It would simplify things to always have a 32-bit owner, with a nonzero value, and thus reserve the range 00xffffffff for internal library use.
Mbed Crypto 1.0.1 Mbed Crypto 1.1.0
----------------- -----------------
Tags: TBD Tags: mbedcrypto-1.1.0
Released in May 2019. <br> Released in early June 2019. <br>
Integrated in Mbed OS 5.13. Integrated in Mbed OS 5.13.
Identical to [1.0.0](#mbed-crypto-1.0.0) except for some changes in the key file format. Identical to [1.0.0](#mbed-crypto-1.0.0) except for some changes in the key file format.
### Key file format for 1.0.1 ### Key file format for 1.1.0
The key file format is identical to [1.0.0](#key-file-format-for-1.0.0), except for the following changes: The key file format is identical to [1.0.0](#key-file-format-for-1.0.0), except for the following changes:
* A new policy field, marked as [NEW:1.0.1] below. * A new policy field, marked as [NEW:1.1.0] below.
* The encoding of key types, algorithms and key material has changed, therefore the storage format is not compatible (despite using the same value in the version field so far). * The encoding of key types, algorithms and key material has changed, therefore the storage format is not compatible (despite using the same value in the version field so far).
A self-contained description of the file layout follows. A self-contained description of the file layout follows.
@ -189,7 +189,7 @@ The layout of a key file is:
* type (4 bytes): `psa_key_type_t` value * type (4 bytes): `psa_key_type_t` value
* policy usage flags (4 bytes): `psa_key_usage_t` value * policy usage flags (4 bytes): `psa_key_usage_t` value
* policy usage algorithm (4 bytes): `psa_algorithm_t` value * policy usage algorithm (4 bytes): `psa_algorithm_t` value
* policy enrollment algorithm (4 bytes): `psa_algorithm_t` value [NEW:1.0.1] * policy enrollment algorithm (4 bytes): `psa_algorithm_t` value [NEW:1.1.0]
* key material length (4 bytes) * key material length (4 bytes)
* key material: output of `psa_export_key` * key material: output of `psa_export_key`
* Any trailing data is rejected on load. * Any trailing data is rejected on load.