Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions crypto/nrf_cc310_bl/include/crys_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ extern "C"
for each module of the layers listed below.
@defgroup crys_error CryptoCell general base error codes
@{
@ingroup cryptocell_api
*/

/*! The definitions of the error number space used for the different modules */
Expand Down Expand Up @@ -267,7 +266,3 @@ typedef uint32_t CRYSError_t;
@}
*/
#endif




1 change: 0 additions & 1 deletion crypto/nrf_cc310_bl/include/ssi_pal_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
@brief This file contains the platform dependent definitions and types.
@defgroup ssi_pal_types CryptoCell PAL platform dependent types
@{
@ingroup ssi_pal
*/

#ifndef SSI_PAL_TYPES_H
Expand Down
4 changes: 2 additions & 2 deletions crypto/nrf_cc310_mbedcrypto/include/cc3xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
* \note This file must be included by psa_crypto_driver_wrappers.c. The
* definition of the context types used in the implementation is provided
* through \ref cc3xx_crypto_primitives_private.h which is included, when
* \ref PSA_CRYPTO_DRIVER_CC3XX is defined, in turn by psa/crypto.h, then
* `PSA_CRYPTO_DRIVER_CC3XX` is defined, in turn by psa/crypto.h, then
* psa/crypto_struct.h and finally by psa/crypto_driver_context_primitives.h
* and by psa/crypto_driver_context_composites.h from the mbedTLS module.
* When \ref PSA_CRYPTO_DRIVER_CC3XX is not defined, the implementation
* When `PSA_CRYPTO_DRIVER_CC3XX` is not defined, the implementation
* must explicitly include \ref cc3xx_crypto_primitives_private.h while the
* interface can include \ref cc3xx_crypto_primitives.h only
*
Expand Down
88 changes: 44 additions & 44 deletions crypto/nrf_cc310_mbedcrypto/include/cc3xx_psa_aead.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern "C" {
* \param[in] ciphertext_size Size in bytes of the ciphertext buffer
* \param[out] ciphertext_length Size in bytes of the encrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t
Expand Down Expand Up @@ -68,7 +68,7 @@ cc3xx_aead_encrypt(const psa_key_attributes_t *attributes,
* \param[in] plaintext_size Size in bytes of the plaintext buffer
* \param[out] plaintext_length Size in bytes of the decrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t
Expand All @@ -88,13 +88,13 @@ cc3xx_aead_decrypt(const psa_key_attributes_t *attributes,
* \param[in] key_buffer The buffer containing the key material.
* \param[in] key_buffer_size Size of \p key_buffer in bytes.
* \param[in] alg The AEAD algorithm
* (#PSA_ALG_IS_AEAD(\p alg) must be true).
* (PSA_ALG_IS_AEAD(\p alg) must be true).
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_BAD_STATE
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_BAD_STATE
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_encrypt_setup(
cc3xx_aead_operation_t *operation,
Expand All @@ -110,13 +110,13 @@ psa_status_t cc3xx_aead_encrypt_setup(
* \param[in] key_buffer The buffer containing the key material.
* \param[in] key_buffer_size Size of \p key_buffer in bytes.
* \param[in] alg The AEAD algorithm
* (#PSA_ALG_IS_AEAD(\p alg) must be true).
* (PSA_ALG_IS_AEAD(\p alg) must be true).
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_BAD_STATE
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_BAD_STATE
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_decrypt_setup(
cc3xx_aead_operation_t *operation,
Expand All @@ -131,12 +131,12 @@ psa_status_t cc3xx_aead_decrypt_setup(
* \param[in] nonce Buffer containing the nonce to use.
* \param[in] nonce_length Size of the nonce in bytes.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_GENERIC_ERROR
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_DATA_INVALID
* \retval PSA_SUCCESS
* \retval PSA_ERROR_GENERIC_ERROR
* \retval PSA_ERROR_NOT_SUPPORTED
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_DATA_INVALID
*/
psa_status_t cc3xx_aead_set_nonce(
cc3xx_aead_operation_t *operation,
Expand All @@ -150,10 +150,10 @@ psa_status_t cc3xx_aead_set_nonce(
* \param[in] ad_length Size of the additional data in bytes.
* \param[in] plaintext_length Size of the plaintext to encrypt in bytes.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_set_lengths(
cc3xx_aead_operation_t *operation,
Expand All @@ -167,11 +167,11 @@ psa_status_t cc3xx_aead_set_lengths(
* \param[in] input Buffer containing the additional data.
* \param[in] input_size Size of the input buffer in bytes.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval #PSA_ERROR_DATA_INVALID
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
* \retval PSA_ERROR_DATA_INVALID
*/
psa_status_t cc3xx_aead_update_ad(
cc3xx_aead_operation_t *operation,
Expand All @@ -188,11 +188,11 @@ psa_status_t cc3xx_aead_update_ad(
* \param[in] output_size Size of the output buffer in bytes.
* \param[out] output_length The number of bytes that make up the output.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval #PSA_ERROR_DATA_INVALID
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
* \retval PSA_ERROR_DATA_INVALID
*/
psa_status_t cc3xx_aead_update(
cc3xx_aead_operation_t *operation,
Expand All @@ -213,10 +213,10 @@ psa_status_t cc3xx_aead_update(
* \param[in] tag_size Size of the tag buffer in bytes.
* \param[out] tag_length The number of bytes that make up the tag.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_finish(
cc3xx_aead_operation_t *operation,
Expand All @@ -237,10 +237,10 @@ psa_status_t cc3xx_aead_finish(
* \param[in] tag Buffer containing the tag
* \param[in] tag_size Size of the tag buffer in bytes
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_verify(
cc3xx_aead_operation_t *operation,
Expand All @@ -254,8 +254,8 @@ psa_status_t cc3xx_aead_verify(
*
* \param[out] operation Initialized AEAD operation.
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval PSA_SUCCESS
* \retval PSA_ERROR_NOT_SUPPORTED
*/
psa_status_t cc3xx_aead_abort(cc3xx_aead_operation_t *operation);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extern "C" {
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the encrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_asymmetric_encrypt(const psa_key_attributes_t *attributes,
Expand Down Expand Up @@ -65,7 +65,7 @@ psa_status_t cc3xx_asymmetric_encrypt(const psa_key_attributes_t *attributes,
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the decrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_asymmetric_decrypt(const psa_key_attributes_t *attributes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern "C" {
* \param[in] signature_size Size in bytes of the signature buffer
* \param[out] signature_length Size in bytes of the signature
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_sign_message(const psa_key_attributes_t *attributes,
Expand All @@ -56,7 +56,7 @@ psa_status_t cc3xx_sign_message(const psa_key_attributes_t *attributes,
* \param[in] signature Signature to verify
* \param[in] signature_length Size in bytes of the signature
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_verify_message(const psa_key_attributes_t *attributes,
Expand All @@ -77,7 +77,7 @@ psa_status_t cc3xx_verify_message(const psa_key_attributes_t *attributes,
* \param[in] signature_size Size in bytes of the signature buffer
* \param[out] signature_length Size in bytes of the signature
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_sign_hash(const psa_key_attributes_t *attributes,
Expand All @@ -97,7 +97,7 @@ psa_status_t cc3xx_sign_hash(const psa_key_attributes_t *attributes,
* \param[in] signature Signature to verify
* \param[in] signature_length Size in bytes of the signature
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_verify_hash(const psa_key_attributes_t *attributes,
Expand Down
32 changes: 16 additions & 16 deletions crypto/nrf_cc310_mbedcrypto/include/cc3xx_psa_cipher.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ extern "C" {
* \param[in] alg Algorithm to setup for which PSA_ALG_IS_CIPHER(alg)
* must be true
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_BAD_STATE
* \retval PSA_SUCCESS
* \retval PSA_ERROR_NOT_SUPPORTED
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_BAD_STATE
*
*/
psa_status_t cc3xx_cipher_encrypt_setup(
Expand All @@ -57,11 +57,11 @@ psa_status_t cc3xx_cipher_encrypt_setup(
* \param[in] alg Algorithm to setup for which PSA_ALG_IS_CIPHER(alg)
* must be true
*
* \retval #PSA_SUCCESS
* \retval #PSA_ERROR_NOT_SUPPORTED
* \retval #PSA_ERROR_INVALID_ARGUMENT
* \retval #PSA_ERROR_CORRUPTION_DETECTED
* \retval #PSA_ERROR_BAD_STATE
* \retval PSA_SUCCESS
* \retval PSA_ERROR_NOT_SUPPORTED
* \retval PSA_ERROR_INVALID_ARGUMENT
* \retval PSA_ERROR_CORRUPTION_DETECTED
* \retval PSA_ERROR_BAD_STATE
*
*/
psa_status_t cc3xx_cipher_decrypt_setup(
Expand All @@ -76,7 +76,7 @@ psa_status_t cc3xx_cipher_decrypt_setup(
* \param[in] iv Buffer holding the IV to setup
* \param[in] iv_length Size in bytes of the IV
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_set_iv(
Expand All @@ -93,7 +93,7 @@ psa_status_t cc3xx_cipher_set_iv(
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the actual output
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_update(
Expand All @@ -109,7 +109,7 @@ psa_status_t cc3xx_cipher_update(
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the encrypted output
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_finish(
Expand All @@ -120,7 +120,7 @@ psa_status_t cc3xx_cipher_finish(
*
* \param[out] operation Pointer to the operation object
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_abort(
Expand All @@ -141,7 +141,7 @@ psa_status_t cc3xx_cipher_abort(
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the encrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_encrypt(
Expand Down Expand Up @@ -170,7 +170,7 @@ psa_status_t cc3xx_cipher_encrypt(
* \param[in] output_size Size in bytes of the output buffer
* \param[out] output_length Size in bytes of the decrypted data
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_cipher_decrypt(
Expand Down
2 changes: 1 addition & 1 deletion crypto/nrf_cc310_mbedcrypto/include/cc3xx_psa_entropy.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extern "C" {
* \param[out] output Collected entropy from the TRNG source
* \param[in] output_size Size of the output buffer
*
* \retval PSA_SUCCESS on success. Error code from \ref psa_status_t on
* \retval PSA_SUCCESS on success. Error code from psa_status_t on
* failure
*/
psa_status_t cc3xx_get_entropy(uint32_t flags, size_t *estimate_bits,
Expand Down
Loading
Loading