From 8645f733cfb0f8dff9d4bab03b6b29fab40415b8 Mon Sep 17 00:00:00 2001
From: Andres Amaya Garcia <andres.amayagarcia@arm.com>
Date: Tue, 8 Jan 2019 20:02:48 +0000
Subject: [PATCH] Update query_config.c with new macros

---
 programs/ssl/query_config.c      | 24 ++++++++++++++++++++++++
 scripts/generate_query_config.pl |  1 +
 2 files changed, 25 insertions(+)

diff --git a/programs/ssl/query_config.c b/programs/ssl/query_config.c
index af518e8ba..b2b1f1687 100644
--- a/programs/ssl/query_config.c
+++ b/programs/ssl/query_config.c
@@ -253,6 +253,14 @@ int query_config( const char *config )
     }
 #endif /* MBEDTLS_DEPRECATED_REMOVED */
 
+#if defined(MBEDTLS_CHECK_PARAMS)
+    if( strcmp( "MBEDTLS_CHECK_PARAMS", config ) == 0 )
+    {
+        MACRO_EXPANSION_TO_STR( MBEDTLS_CHECK_PARAMS );
+        return( 0 );
+    }
+#endif /* MBEDTLS_CHECK_PARAMS */
+
 #if defined(MBEDTLS_TIMING_ALT)
     if( strcmp( "MBEDTLS_TIMING_ALT", config ) == 0 )
     {
@@ -933,6 +941,14 @@ int query_config( const char *config )
     }
 #endif /* MBEDTLS_ECP_NIST_OPTIM */
 
+#if defined(MBEDTLS_ECP_RESTARTABLE)
+    if( strcmp( "MBEDTLS_ECP_RESTARTABLE", config ) == 0 )
+    {
+        MACRO_EXPANSION_TO_STR( MBEDTLS_ECP_RESTARTABLE );
+        return( 0 );
+    }
+#endif /* MBEDTLS_ECP_RESTARTABLE */
+
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
     if( strcmp( "MBEDTLS_ECDSA_DETERMINISTIC", config ) == 0 )
     {
@@ -2069,6 +2085,14 @@ int query_config( const char *config )
     }
 #endif /* MBEDTLS_CTR_DRBG_MAX_SEED_INPUT */
 
+#if defined(MBEDTLS_CTR_DRBG_USE_128_BIT_KEY)
+    if( strcmp( "MBEDTLS_CTR_DRBG_USE_128_BIT_KEY", config ) == 0 )
+    {
+        MACRO_EXPANSION_TO_STR( MBEDTLS_CTR_DRBG_USE_128_BIT_KEY );
+        return( 0 );
+    }
+#endif /* MBEDTLS_CTR_DRBG_USE_128_BIT_KEY */
+
 #if defined(MBEDTLS_HMAC_DRBG_RESEED_INTERVAL)
     if( strcmp( "MBEDTLS_HMAC_DRBG_RESEED_INTERVAL", config ) == 0 )
     {
diff --git a/scripts/generate_query_config.pl b/scripts/generate_query_config.pl
index 651f0d4d7..f15e03a35 100755
--- a/scripts/generate_query_config.pl
+++ b/scripts/generate_query_config.pl
@@ -29,6 +29,7 @@ my $query_config_file = "./programs/ssl/query_config.c";
 # throw errors.
 my @excluded = qw(
 MBEDTLS_SSL_CIPHERSUITES
+MBEDTLS_PARAM_FAILED
 );
 my $excluded_re = join '|', @excluded;