commit 252e391cca6c11d161adec1b5424a831404f5949
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Feb 26 18:33:58 2020 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Mar 19 13:53:18 2020 +0100
tree 971dfee7d094006c0aff7160903e1026cf107222
parent 458b8f2a59b9559ffd6005c0013544f910ebcfef

Revert "config: Remove X.509 options"

This reverts commit bb1f70121218b461a4197224d547e6bcfae4f991.

* include/mbedtls/check_config.h:
    * MBEDTLS_X509_RSASSA_PSS_SUPPORT: there has been an addition (of
      MBEDTLS_SHA512_NO_SHA384) at the place where it was removed.
      Re-add it before MBEDTLS_SHA512_NO_SHA384 to keep it grouped
      with MBEDTLS_RSA_C.

Conflicts:
* scripts/config.pl: this file has been replaced by config.py. Port
  the reversed changes to config.py:
    * Revert removing three symbols from the list of symbols to
      exclude from full.

tests/scripts/depends-pkalgs.pl

diff --git a/tests/scripts/depends-pkalgs.pl b/tests/scripts/depends-pkalgs.pl
index 7fbd6d7..c05edaa 100755
--- a/tests/scripts/depends-pkalgs.pl
+++ b/tests/scripts/depends-pkalgs.pl
@@ -39,9 +39,10 @@
     'MBEDTLS_ECP_C'     => ['MBEDTLS_ECDSA_C',
                             'MBEDTLS_ECDH_C',
                             'MBEDTLS_ECJPAKE_C'],
-    'MBEDTLS_PKCS1_V21' => [],
+    'MBEDTLS_X509_RSASSA_PSS_SUPPORT'   => [],
+    'MBEDTLS_PKCS1_V21' => ['MBEDTLS_X509_RSASSA_PSS_SUPPORT'],
     'MBEDTLS_PKCS1_V15' => [],
-    'MBEDTLS_RSA_C'     => [],
+    'MBEDTLS_RSA_C'     => ['MBEDTLS_X509_RSASSA_PSS_SUPPORT'],
 );
 
 system( "cp $config_h $config_h.bak" ) and die;