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.

scripts/config.py

diff --git a/scripts/config.py b/scripts/config.py
index 6d4828a..df2d3d5 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -177,6 +177,7 @@
             'MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES',
             'MBEDTLS_NO_PLATFORM_ENTROPY',
             'MBEDTLS_NO_UDBL_DIVISION',
+            'MBEDTLS_PKCS11_C',
             'MBEDTLS_PLATFORM_NO_STD_FUNCTIONS',
             'MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER',
             'MBEDTLS_PSA_CRYPTO_SE_C',
@@ -185,6 +186,8 @@
             'MBEDTLS_RSA_NO_CRT',
             'MBEDTLS_SHA512_NO_SHA384',
             'MBEDTLS_TEST_NULL_ENTROPY',
+            'MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3',
+            'MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION',
     ]:
         return False
     if name.endswith('_ALT'):