commit e82d43e7cef335f05b3d61d16686b201c7ca4305
author Olivier Deprez <olivier.deprez@arm.com> Tue Jan 21 15:26:21 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Jan 21 15:26:21 2020 +0000
tree 0d3fe5566391d87751eaabf1a55d647b73016ef0
parent 1d069cef6820a65987889409c98f2f480e84ef38
parent 0b144831090a61a2f1ad41e6588c87c7de8a19d2

Merge "cert_create: Remove some unused header files inclusions" into integration

tools/cert_create/src/cert.c

diff --git a/tools/cert_create/src/cert.c b/tools/cert_create/src/cert.c
index c68a265..153f555 100644
--- a/tools/cert_create/src/cert.c
+++ b/tools/cert_create/src/cert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -15,12 +15,6 @@
 #include <openssl/sha.h>
 #include <openssl/x509v3.h>
 
-#if USE_TBBR_DEFS
-#include <tbbr_oid.h>
-#else
-#include <platform_oid.h>
-#endif
-
 #include "cert.h"
 #include "cmd_opt.h"
 #include "debug.h"

tools/cert_create/src/key.c

diff --git a/tools/cert_create/src/key.c b/tools/cert_create/src/key.c
index 0f80cce..fcc9d53 100644
--- a/tools/cert_create/src/key.c
+++ b/tools/cert_create/src/key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -13,12 +13,6 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#if USE_TBBR_DEFS
-#include <tbbr_oid.h>
-#else
-#include <platform_oid.h>
-#endif
-
 #include "cert.h"
 #include "cmd_opt.h"
 #include "debug.h"

tools/cert_create/src/main.c

diff --git a/tools/cert_create/src/main.c b/tools/cert_create/src/main.c
index 0cbd219..863db7b 100644
--- a/tools/cert_create/src/main.c
+++ b/tools/cert_create/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -19,21 +19,12 @@
 #include <openssl/sha.h>
 #include <openssl/x509v3.h>
 
-#if USE_TBBR_DEFS
-#include <tbbr_oid.h>
-#else
-#include <platform_oid.h>
-#endif
-
 #include "cert.h"
 #include "cmd_opt.h"
 #include "debug.h"
 #include "ext.h"
 #include "key.h"
 #include "sha.h"
-#include "tbbr/tbb_cert.h"
-#include "tbbr/tbb_ext.h"
-#include "tbbr/tbb_key.h"
 
 /*
  * Helper macros to simplify the code. This macro assigns the return value of