Merge pull request #157 from kotegowder/release

v1.0 updates to release branch.
ARM-software · Mar 5, 2020 · 3d986e7 · 3d986e7
2 parents b6220d1 + 10a1a65
commit 3d986e7
Show file tree

Hide file tree

Showing 1,402 changed files with 37,827 additions and 24,772 deletions.
diff --git a/README.md b/README.md
@@ -11,11 +11,15 @@ For more information, visit the PSA webpage [here](https://developer.arm.com/pro
 
 ### PSA APIs specifications
 
-PSA APIs reference header files are located at [api-specs](api-specs/include) directory.
+PSA APIs reference header files are located at [api-specs](api-specs/) directory.
 
 ### PSA Functional API Certification
 The [PSA Dev API tests](api-tests/dev_apis) are the basis for getting the PSA Functional API Certification. For more information on the certification program, see [psacertified.org](https://www.psacertified.org/functional-api-certification/) 
 
+## GitHub branch
+  - For functional API certification, use the release branch and pick the appropriate release tag.
+  - To get the latest version of the code with bug fixes and new features, use the master branch.
+
 ## Architecture test suite
 
 The current implementation of the Architecture test suite contains tests for following PSA specifications. Arm licensees may contact their partner manager to obtain a copy of this specification. <br />

diff --git a/api-specs/include/psa/initial_attestation.h → ...0-beta0/include/psa/initial_attestation.h b/api-specs/include/psa/initial_attestation.h → ...0-beta0/include/psa/initial_attestation.h
diff --git a/api-specs/attestation/v1.0/doc/IHI0085-PSA_Attestation_API-1.0.0.pdf b/api-specs/attestation/v1.0/doc/IHI0085-PSA_Attestation_API-1.0.0.pdf
diff --git a/api-specs/include/psa/crypto.h → ...cs/crypto/v1.0-beta1/include/psa/crypto.h b/api-specs/include/psa/crypto.h → ...cs/crypto/v1.0-beta1/include/psa/crypto.h
diff --git a/api-specs/include/psa/crypto_extra.h → ...pto/v1.0-beta1/include/psa/crypto_extra.h b/api-specs/include/psa/crypto_extra.h → ...pto/v1.0-beta1/include/psa/crypto_extra.h
diff --git a/api-specs/include/psa/crypto_platform.h → .../v1.0-beta1/include/psa/crypto_platform.h b/api-specs/include/psa/crypto_platform.h → .../v1.0-beta1/include/psa/crypto_platform.h
diff --git a/api-specs/include/psa/crypto_sizes.h → ...pto/v1.0-beta1/include/psa/crypto_sizes.h b/api-specs/include/psa/crypto_sizes.h → ...pto/v1.0-beta1/include/psa/crypto_sizes.h
diff --git a/api-specs/include/psa/crypto_struct.h → ...to/v1.0-beta1/include/psa/crypto_struct.h b/api-specs/include/psa/crypto_struct.h → ...to/v1.0-beta1/include/psa/crypto_struct.h
diff --git a/api-specs/include/psa/crypto_types.h → ...pto/v1.0-beta1/include/psa/crypto_types.h b/api-specs/include/psa/crypto_types.h → ...pto/v1.0-beta1/include/psa/crypto_types.h
diff --git a/api-specs/include/psa/crypto_values.h → ...to/v1.0-beta1/include/psa/crypto_values.h b/api-specs/include/psa/crypto_values.h → ...to/v1.0-beta1/include/psa/crypto_values.h
diff --git a/api-specs/crypto/v1.0-beta3/doc/IHI0086-PSA_Cryptography_API-1.0.0-beta.3.pdf b/api-specs/crypto/v1.0-beta3/doc/IHI0086-PSA_Cryptography_API-1.0.0-beta.3.pdf
diff --git a/api-specs/crypto/v1.0/doc/IHI0086-PSA_Cryptography_API-1.0.0.pdf b/api-specs/crypto/v1.0/doc/IHI0086-PSA_Cryptography_API-1.0.0.pdf
diff --git a/...cs/include/psa/internal_trusted_storage.h → ...a2/include/psa/internal_trusted_storage.h b/...cs/include/psa/internal_trusted_storage.h → ...a2/include/psa/internal_trusted_storage.h
diff --git a/api-specs/include/psa/protected_storage.h → ...1.0-beta2/include/psa/protected_storage.h b/api-specs/include/psa/protected_storage.h → ...1.0-beta2/include/psa/protected_storage.h
diff --git a/api-specs/storage/v1.0/doc/IHI0087-PSA_Storage_API-1.0.0.pdf b/api-specs/storage/v1.0/doc/IHI0087-PSA_Storage_API-1.0.0.pdf