commit 5f97be63699ee6eb596ee22bfe7de1bba8330f21
author Jaeden Amero <jaeden.amero@arm.com> Mon Mar 26 18:32:14 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Tue Mar 27 16:47:24 2018 +0100
tree c8cc75885570d9c1d1748f02193db3b66daff261
parent 877c6dcf223cb8417b51f0de123fbaa59451be23
parent 9ff0f052b38d823393f24bebfe91207b4e2a31d6

Merge remote-tracking branch 'upstream-public/pr/1495' into mbedtls-2.7-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a26d588..b0a01c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
    * Add missing dependencies in test suites that led to build failures
      in configurations that omit certain hashes or public-key algorithms.
      Fixes #1040.
+   * Fix C89 incompatibility in benchmark.c. Contributed by Brendan Shanks.
+     #1353
 
 Changes
    * Support cmake build where Mbed TLS is a subproject. Fix

programs/test/benchmark.c

diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 2864caf..1945b30 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -658,13 +658,13 @@
     if( todo.dhm )
     {
         int dhm_sizes[] = { 2048, 3072 };
-        const unsigned char dhm_P_2048[] =
+        static const unsigned char dhm_P_2048[] =
             MBEDTLS_DHM_RFC3526_MODP_2048_P_BIN;
-        const unsigned char dhm_P_3072[] =
+        static const unsigned char dhm_P_3072[] =
             MBEDTLS_DHM_RFC3526_MODP_3072_P_BIN;
-        const unsigned char dhm_G_2048[] =
+        static const unsigned char dhm_G_2048[] =
             MBEDTLS_DHM_RFC3526_MODP_2048_G_BIN;
-        const unsigned char dhm_G_3072[] =
+        static const unsigned char dhm_G_3072[] =
             MBEDTLS_DHM_RFC3526_MODP_3072_G_BIN;
 
         const unsigned char *dhm_P[] = { dhm_P_2048, dhm_P_3072 };