From a994499bf3123761b268a010c127b701b33e7d92 Mon Sep 17 00:00:00 2001 From: Moran Peker Date: Tue, 12 Feb 2019 14:32:52 +0200 Subject: [PATCH] Atteststaion: Update header files -Remove psa_initial_attesttaion.h -Move psa_initial_attesttaion_api.h and psa_attest_inject_key.h into inc folder -Update include in test file --- TESTS/psa/attestation/main.cpp | 3 +- .../psa}/psa_attest_inject_key.h | 0 .../psa}/psa_initial_attestation_api.h | 0 .../attestation/psa_initial_attestation.h | 30 ------------------- 4 files changed, 2 insertions(+), 31 deletions(-) rename components/TARGET_PSA/{services/attestation => inc/psa}/psa_attest_inject_key.h (100%) mode change 100755 => 100644 rename components/TARGET_PSA/{services/attestation => inc/psa}/psa_initial_attestation_api.h (100%) mode change 100755 => 100644 delete mode 100755 components/TARGET_PSA/services/attestation/psa_initial_attestation.h diff --git a/TESTS/psa/attestation/main.cpp b/TESTS/psa/attestation/main.cpp index b76689fd6d..ef53cd2c68 100755 --- a/TESTS/psa/attestation/main.cpp +++ b/TESTS/psa/attestation/main.cpp @@ -19,7 +19,8 @@ #include "greentea-client/test_env.h" #include "unity/unity.h" #include "utest/utest.h" -#include "psa_initial_attestation.h" +#include "psa_initial_attestation_api.h" +#include "psa_attest_inject_key.h" #include #include diff --git a/components/TARGET_PSA/services/attestation/psa_attest_inject_key.h b/components/TARGET_PSA/inc/psa/psa_attest_inject_key.h old mode 100755 new mode 100644 similarity index 100% rename from components/TARGET_PSA/services/attestation/psa_attest_inject_key.h rename to components/TARGET_PSA/inc/psa/psa_attest_inject_key.h diff --git a/components/TARGET_PSA/services/attestation/psa_initial_attestation_api.h b/components/TARGET_PSA/inc/psa/psa_initial_attestation_api.h old mode 100755 new mode 100644 similarity index 100% rename from components/TARGET_PSA/services/attestation/psa_initial_attestation_api.h rename to components/TARGET_PSA/inc/psa/psa_initial_attestation_api.h diff --git a/components/TARGET_PSA/services/attestation/psa_initial_attestation.h b/components/TARGET_PSA/services/attestation/psa_initial_attestation.h deleted file mode 100755 index 91e5a22c20..0000000000 --- a/components/TARGET_PSA/services/attestation/psa_initial_attestation.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2018-2019, Arm Limited. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - * - */ - -/***************************************************************************/ -/* DRAFT UNDER REVIEW */ -/* These APIs are still evolving and are meant as a prototype for review.*/ -/* The APIs will change depending on feedback and will be firmed up */ -/* to a stable set of APIs once all the feedback has been considered. */ -/***************************************************************************/ - -#ifndef __PSA_INITIAL_ATTESTATION_H__ -#define __PSA_INITIAL_ATTESTATION_H__ - -#include "psa_initial_attestation_api.h" -#include "psa_attest_inject_key.h" - - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __PSA_INITIAL_ATTESTATION_H__ */