diff options
Diffstat (limited to 'lib')
17 files changed, 38 insertions, 38 deletions
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_cc_sha512_t.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_cc_sha512_t.c index bf835bb915..66585ce6c1 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_cc_sha512_t.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_cc_sha512_t.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,7 +8,7 @@ #include "cc_pal_abort.h" #include "mbedtls_cc_sha512_t.h" -#include "sha512.h" +#include "mbedtls/sha512.h" #include "cc_pal_mem.h" #if defined(MBEDTLS_SHA512_C) diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_ccm_internal.h b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_ccm_internal.h index e15950c46c..5687df9613 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_ccm_internal.h +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/api/mbedtls_ccm_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,7 +12,7 @@ extern "C" { #endif -#include "ccm.h" +#include "mbedtls/ccm.h" int mbedtls_ccm_get_security_level(uint8_t sizeOfT, uint8_t *pSecurityLevel); diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/driver/srp_driver.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/driver/srp_driver.c index 3cbfaa2769..70194d5ef7 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/driver/srp_driver.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/cc3x_sym/driver/srp_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -13,7 +13,7 @@ #include "hash_driver.h" #include "mbedtls_cc_srp_error.h" #include "cc_general_defs.h" -#include "md.h" +#include "mbedtls/md.h" #include "cc_bitops.h" diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_mont/cc_ec_mont.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_mont/cc_ec_mont.c index e7d8cf4650..5f8c7399ad 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_mont/cc_ec_mont.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_mont/cc_ec_mont.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,7 +15,7 @@ #include "ec_mont_local.h" #include "ec_mont.h" #include "cc_general_defs.h" -#include "md.h" +#include "mbedtls/md.h" // RL Debug #include "pki_dbg.h" diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_sign.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_sign.c index 2ef8c8f29b..69c3249387 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_sign.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_sign.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -22,7 +22,7 @@ #include "ec_wrst.h" #ifdef USE_MBEDTLS_CRYPTOCELL #include "cc_general_defs.h" -#include "md.h" +#include "mbedtls/md.h" #endif /************************ Defines *****************************************/ diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_verify.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_verify.c index e95ea41558..d6a56ef0d5 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_verify.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/ec_wrst/cc_ecdsa_verify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,7 +17,7 @@ #include "ec_wrst.h" #ifdef USE_MBEDTLS_CRYPTOCELL #include "cc_general_defs.h" -#include "md.h" +#include "mbedtls/md.h" #endif /************************ Defines *****************************************/ diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/kdf/cc_kdf.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/kdf/cc_kdf.c index 901f31baf5..7f233f76dd 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/kdf/cc_kdf.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/kdf/cc_kdf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -13,7 +13,7 @@ #include "cc_fips_defs.h" #include "cc_general_defs.h" #ifdef USE_MBEDTLS_CRYPTOCELL -#include "md.h" +#include "mbedtls/md.h" #else #include "cc_hash.h" #endif diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/pki/ec_edw/ec_edw.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/pki/ec_edw/ec_edw.c index fb27325c49..baa4c113ff 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/pki/ec_edw/ec_edw.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/pki/ec_edw/ec_edw.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -30,7 +30,7 @@ #include "pki_dbg.h" #include "cc_int_general_defs.h" #include "cc_general_defs.h" -#include "md.h" +#include "mbedtls/md.h" /* global data definitions */ extern CC_PalMutex CCAsymCryptoMutex; diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/rnd_dma/cc_rnd_common.c b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/rnd_dma/cc_rnd_common.c index 7bdd81157a..792b7f723b 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/rnd_dma/cc_rnd_common.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/rnd_dma/cc_rnd_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -23,8 +23,8 @@ #include "cc_fips_defs.h" #include "cc_util_pm.h" #ifdef CC_IOT -#include "ctr_drbg.h" -#include "entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/entropy.h" #endif /* CC RND module version compliant to NIST 800-90 standard. Based on CTR DRBG Block Cipher (AES) */ diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/cmac_alt.c b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/cmac_alt.c index 9c15b9bcad..7e78950760 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/cmac_alt.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/cmac_alt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -50,7 +50,7 @@ #include "cc_aes_error.h" #include "mbedtls_common.h" #include "mbedtls/cmac.h" -#include "memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" /** diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/ecp_common.c b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/ecp_common.c index c64b9c3740..5aaf69d8e3 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/ecp_common.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/ecp_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,7 +8,7 @@ #include "cc_pal_log.h" #include "cc_ecpki_error.h" #include "mbedtls_cc_ec_mont_edw_error.h" -#include "ecp.h" +#include "mbedtls/ecp.h" #include "ecp_common.h" #include "cc_bitops.h" diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/rsa_alt.c b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/rsa_alt.c index ee6bc5eede..b48c57a576 100644 --- a/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/rsa_alt.c +++ b/lib/ext/cryptocell-312-runtime/codesafe/src/mbedtls_api/rsa_alt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,7 +17,7 @@ #include "mbedtls/rsa_internal.h" #include "mbedtls/oid.h" #include "mbedtls_common.h" -#include "bignum.h" +#include "mbedtls/bignum.h" #include <string.h> @@ -62,7 +62,7 @@ #include "pki.h" #include "rsa.h" -#include "ctr_drbg.h" +#include "mbedtls/ctr_drbg.h" #include "pka.h" #include "cc_pal_abort.h" diff --git a/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/cc_lib.c b/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/cc_lib.c index 0a97ce4446..7fc7ee107b 100644 --- a/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/cc_lib.c +++ b/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/cc_lib.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -25,9 +25,9 @@ #include "dx_id_registers.h" #include "cc_util_pm.h" #include "dx_nvm.h" -#include "ctr_drbg.h" -#include "entropy.h" -#include "threading.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/entropy.h" +#include "mbedtls/threading.h" #include "mbedtls_cc_mng_int.h" #include "mbedtls_cc_mng.h" #include "cc_rnd_common.h" diff --git a/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/mbedtls_cc_util_asset_prov.c b/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/mbedtls_cc_util_asset_prov.c index 37f8863001..01b28e7a2a 100644 --- a/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/mbedtls_cc_util_asset_prov.c +++ b/lib/ext/cryptocell-312-runtime/host/src/cc3x_lib/mbedtls_cc_util_asset_prov.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,7 +15,7 @@ #include "mbedtls_cc_util_defs.h" #include "cc_util_error.h" #include "cc_aes_defs.h" -#include "ccm.h" +#include "mbedtls/ccm.h" #include "aes_driver.h" #include "driver_defs.h" #include "cc_util_cmac.h" diff --git a/lib/ext/cryptocell-312-runtime/host/src/cc3x_productionlib/common/prod_crypto_driver.c b/lib/ext/cryptocell-312-runtime/host/src/cc3x_productionlib/common/prod_crypto_driver.c index 123c21688a..3e296878f6 100644 --- a/lib/ext/cryptocell-312-runtime/host/src/cc3x_productionlib/common/prod_crypto_driver.c +++ b/lib/ext/cryptocell-312-runtime/host/src/cc3x_productionlib/common/prod_crypto_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -21,7 +21,7 @@ #include "driver_defs.h" #include "cc_production_asset.h" #include "cc_aes_defs.h" -#include "ccm.h" +#include "mbedtls/ccm.h" /** * This function is used to perform AES operation. diff --git a/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc3x/mbedtls_cc_sha512_t.h b/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc3x/mbedtls_cc_sha512_t.h index 64ccaf869d..c999e4d594 100644 --- a/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc3x/mbedtls_cc_sha512_t.h +++ b/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc3x/mbedtls_cc_sha512_t.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,7 +19,7 @@ #ifndef _MBEDTLS_CC_SHA512_T_H #define _MBEDTLS_CC_SHA512_T_H -#include <sha512.h> +#include <mbedtls/sha512.h> /*! @brief This function initializes the SHA-512_t context. diff --git a/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc_rsa_types.h b/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc_rsa_types.h index f40c0a8f8f..20c79030e1 100644 --- a/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc_rsa_types.h +++ b/lib/ext/cryptocell-312-runtime/shared/include/crypto_api/cc_rsa_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2001-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,7 +17,7 @@ #include "ccsw_rsa_shared_types.h" #endif #ifdef USE_MBEDTLS_CRYPTOCELL -#include "md.h" +#include "mbedtls/md.h" #else #include "cc_hash.h" #endif |