Merge remote-tracking branch 'upstream-public/pr/865' into development

This commit is contained in:
Gilles Peskine 2018-01-02 15:35:18 +01:00
commit 7c483b6765
4 changed files with 23 additions and 0 deletions

View file

@ -96,6 +96,9 @@ static const char *features[] = {
#if defined(MBEDTLS_CAMELLIA_ALT)
"MBEDTLS_CAMELLIA_ALT",
#endif /* MBEDTLS_CAMELLIA_ALT */
#if defined(MBEDTLS_CCM_ALT)
"MBEDTLS_CCM_ALT",
#endif /* MBEDTLS_CCM_ALT */
#if defined(MBEDTLS_DES_ALT)
"MBEDTLS_DES_ALT",
#endif /* MBEDTLS_DES_ALT */