aboutsummaryrefslogtreecommitdiff
path: root/plat/common/tbbr
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-05-22 12:11:24 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-05-24 00:08:35 +0900
commitbb41eb7a9dc3e3b31df2e20237a2bcf1a3cae72a (patch)
treea042602a9ffeed90bdcfd95dc504508222f32bca /plat/common/tbbr
parent2a6c1a8f9a41d053b58036fbb4478c799c987343 (diff)
downloadtrusted-firmware-a-bb41eb7a9dc3e3b31df2e20237a2bcf1a3cae72a.tar.gz
cert: move platform_oid.h to include/tools_share for all platforms
Platforms aligned with TBBR are supposed to use their own OIDs, but defining the same macros with different OIDs does not provide any value (at least technically). For easier use of TBBR, this commit allows platforms to reuse the OIDs obtained by ARM Ltd. This will be useful for non-ARM vendors that do not need their own extension fields in their certificate files. The OIDs of ARM Ltd. have been moved to include/tools_share/tbbr_oid.h Platforms can include <tbbr_oid.h> instead of <platform_oid.h> by defining USE_TBBR_DEFS as 1. USE_TBBR_DEFS is 0 by default to keep the backward compatibility. For clarification, I inserted a blank line between headers from the include/ directory (#include <...>) and ones from a local directory (#include "..." ). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat/common/tbbr')
-rw-r--r--plat/common/tbbr/plat_tbbr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/plat/common/tbbr/plat_tbbr.c b/plat/common/tbbr/plat_tbbr.c
index 4aa9457dcb..f5a4f315c9 100644
--- a/plat/common/tbbr/plat_tbbr.c
+++ b/plat/common/tbbr/plat_tbbr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,11 @@
#include <assert.h>
#include <auth/auth_mod.h>
#include <platform.h>
+#if USE_TBBR_DEFS
+#include <tbbr_oid.h>
+#else
#include <platform_oid.h>
+#endif
#include <string.h>
/*