commit 7e67bd516db0cc6a9bcfad8567f2c1b8e1424b6a
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Mar 10 22:35:24 2023 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Mar 15 20:47:59 2023 +0100
tree 56919feba41dcd0a9d21d8d5c214598ad48a2c9f
parent 9af58cd7f8e08a66b3e9b11106c31ab56be7e67f

AES, GCM selftest: indicate which implementation is used

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 15b505f..e41810a 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1729,6 +1729,29 @@
     memset(key, 0, 32);
     mbedtls_aes_init(&ctx);
 
+    if (verbose != 0) {
+#if defined(MBEDTLS_AES_ALT)
+        mbedtls_printf("  AES note: alternative implementation.\n");
+#else /* MBEDTLS_AES_ALT */
+#if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86)
+        if (mbedtls_padlock_has_support(MBEDTLS_PADLOCK_ACE)) {
+            mbedtls_printf("  AES note: using VIA Padlock.\n");
+        } else
+#endif
+#if defined(MBEDTLS_AESNI_HAVE_CODE)
+        if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES)) {
+            mbedtls_printf("  AES note: using AESNI.\n");
+        } else
+#endif
+#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_HAVE_ARM64)
+        if (mbedtls_aesce_has_support()) {
+            mbedtls_printf("  AES note: using AESCE.\n");
+        } else
+#endif
+        mbedtls_printf("  AES note: built-in implementation.\n");
+#endif /* MBEDTLS_AES_ALT */
+    }
+
     /*
      * ECB mode
      */

library/gcm.c

diff --git a/library/gcm.c b/library/gcm.c
index 8e773d7..4e8ec08 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -845,6 +845,20 @@
     mbedtls_cipher_id_t cipher = MBEDTLS_CIPHER_ID_AES;
     size_t olen;
 
+    if (verbose != 0)
+    {
+#if defined(MBEDTLS_GCM_ALT)
+        mbedtls_printf("  GCM note: alternative implementation.\n");
+#else /* MBEDTLS_GCM_ALT */
+#if defined(MBEDTLS_AESNI_HAVE_CODE)
+        if (mbedtls_aesni_has_support(MBEDTLS_AESNI_CLMUL)) {
+            mbedtls_printf("  GCM note: using AESNI.\n");
+        } else
+#endif
+        mbedtls_printf("  GCM note: built-in implementation.\n");
+#endif /* MBEDTLS_GCM_ALT */
+    }
+
     for (j = 0; j < 3; j++) {
         int key_len = 128 + 64 * j;