commit 2c8ad9400be0d58aebaa968864dea268857b0fb0
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Mar 10 22:35:24 2023 +0100
committer Tom Cosgrove <tom.cosgrove@arm.com> Fri Mar 17 16:31:14 2023 +0000
tree 065095c478887383e7deaea76e915713baf357e2
parent 5511a34566aa455512a704604a11120dee426631

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 66c697a..a81332d 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1785,6 +1785,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 2778012..463ef48 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -754,6 +754,20 @@
     int i, j, ret;
     mbedtls_cipher_id_t cipher = MBEDTLS_CIPHER_ID_AES;
 
+    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;