tor

commit 7c95fd2d6ebd3f706ed6208b7b186eaae99fe494
parent f287d5e54bc4390ad67ffed40251301b5f594644
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 12 Jun 2025 11:54:42 -0400

Merge branch 'tor-gitlab/mr/901'

Diffstat:
M
src/ext/polyval/polyval.c
 | 
6
+++---
M
src/test/test_crypto.c
 | 
2
+-

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ext/polyval/polyval.c b/src/ext/polyval/polyval.c
@@ -431,10 +431,10 @@ PV_DECLARE(, , u128_from_bytes_ctmul,
 void
 polyval_detect_implementation(void)
 {
-  unsigned int eax, ebc, ecx, edx;
+  unsigned int eax, ebx, ecx, edx;
   use_pclmul = false;
-  if (__get_cpuid(1, &eax, &ebc, &ecx, &edx)) {
-    if (0 != (ecx & (1<<1))) {
+  if (__get_cpuid(1, &eax, &ebx, &ecx, &edx)) {
+    if (0 != (ecx & bit_PCLMUL)) {
       use_pclmul = true;
     }
   }
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
@@ -3450,7 +3450,7 @@ test_crypto_aes_cnt_set_iv(void *arg)
 struct testcase_t crypto_tests[] = {
   CRYPTO_LEGACY(formats),
   { "openssl_version", test_crypto_openssl_version, TT_FORK, NULL, NULL },
-  { "aes_AES", test_crypto_aes128, TT_FORK, NULL, NULL },
+  { "aes", test_crypto_aes128, TT_FORK, NULL, NULL },
   { "aes128_ctr_testvec", test_crypto_aes_ctr_testvec, 0,
     &passthrough_setup, (void*)"128" },
   { "aes192_ctr_testvec", test_crypto_aes_ctr_testvec, 0,