Merge branch 'modexpng' to 'master'

1 files changed, 11 insertions, 4 deletions

diff --git a/projects/cli-test/mgmt-cli.c b/projects/cli-test/mgmt-cli.c
index d7f7383..960d691 100644
--- a/projects/cli-test/mgmt-cli.c
+++ b/projects/cli-test/mgmt-cli.c
@@ -4,6 +4,8 @@
  * Management CLI code.
  *
  * Copyright (c) 2016-2017, NORDUnet A/S All rights reserved.
+ * Copyright: 2020, The Commons Conservancy Cryptech Project
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -15,9 +17,9 @@
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * - Neither the name of the NORDUnet nor the names of its contributors may
- *   be used to endorse or promote products derived from this software
- *   without specific prior written permission.
+ * - Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
  * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -47,6 +49,9 @@
 #include "mgmt-test.h"
 #include "mgmt-keystore.h"
 #include "mgmt-masterkey.h"
+#ifdef DO_TIMING
+#include "mgmt-timing.h"
+#endif
 
 #undef HAL_OK
 #define HAL_OK LIBHAL_OK
@@ -172,9 +177,11 @@ int cli_main(void)
     configure_cli_show(cli);
     configure_cli_fpga(cli);
     configure_cli_misc(cli);
-    configure_cli_test(cli);
     configure_cli_keystore(cli);
     configure_cli_masterkey(cli);
+#ifdef DO_TIMING
+    configure_cli_timing(cli);
+#endif
 
     while (1) {
         control_mgmt_uart_dma_rx(DMA_RX_START);