diff options
Diffstat (limited to 'src/lib/libcrypto/modes/gcm128.c')
-rw-r--r-- | src/lib/libcrypto/modes/gcm128.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c index cbda8ad097..6c89bd44b7 100644 --- a/src/lib/libcrypto/modes/gcm128.c +++ b/src/lib/libcrypto/modes/gcm128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gcm128.c,v 1.26 2023/08/10 07:18:43 jsing Exp $ */ | 1 | /* $OpenBSD: gcm128.c,v 1.27 2024/09/06 09:57:32 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -50,9 +50,12 @@ | |||
50 | 50 | ||
51 | #define OPENSSL_FIPSAPI | 51 | #define OPENSSL_FIPSAPI |
52 | 52 | ||
53 | #include <string.h> | ||
54 | |||
53 | #include <openssl/crypto.h> | 55 | #include <openssl/crypto.h> |
56 | |||
57 | #include "crypto_internal.h" | ||
54 | #include "modes_local.h" | 58 | #include "modes_local.h" |
55 | #include <string.h> | ||
56 | 59 | ||
57 | #ifndef MODES_DEBUG | 60 | #ifndef MODES_DEBUG |
58 | # ifndef NDEBUG | 61 | # ifndef NDEBUG |
@@ -660,7 +663,7 @@ CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block) | |||
660 | # if defined(GHASH_ASM_X86_OR_64) | 663 | # if defined(GHASH_ASM_X86_OR_64) |
661 | # if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2) | 664 | # if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2) |
662 | /* check FXSR and PCLMULQDQ bits */ | 665 | /* check FXSR and PCLMULQDQ bits */ |
663 | if ((OPENSSL_cpu_caps() & (CPUCAP_MASK_FXSR | CPUCAP_MASK_PCLMUL)) == | 666 | if ((crypto_cpu_caps_ia32() & (CPUCAP_MASK_FXSR | CPUCAP_MASK_PCLMUL)) == |
664 | (CPUCAP_MASK_FXSR | CPUCAP_MASK_PCLMUL)) { | 667 | (CPUCAP_MASK_FXSR | CPUCAP_MASK_PCLMUL)) { |
665 | gcm_init_clmul(ctx->Htable, ctx->H.u); | 668 | gcm_init_clmul(ctx->Htable, ctx->H.u); |
666 | ctx->gmult = gcm_gmult_clmul; | 669 | ctx->gmult = gcm_gmult_clmul; |
@@ -671,9 +674,9 @@ CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block) | |||
671 | gcm_init_4bit(ctx->Htable, ctx->H.u); | 674 | gcm_init_4bit(ctx->Htable, ctx->H.u); |
672 | # if defined(GHASH_ASM_X86) /* x86 only */ | 675 | # if defined(GHASH_ASM_X86) /* x86 only */ |
673 | # if defined(OPENSSL_IA32_SSE2) | 676 | # if defined(OPENSSL_IA32_SSE2) |
674 | if (OPENSSL_cpu_caps() & CPUCAP_MASK_SSE) { /* check SSE bit */ | 677 | if (crypto_cpu_caps_ia32() & CPUCAP_MASK_SSE) { /* check SSE bit */ |
675 | # else | 678 | # else |
676 | if (OPENSSL_cpu_caps() & CPUCAP_MASK_MMX) { /* check MMX bit */ | 679 | if (crypto_cpu_caps_ia32() & CPUCAP_MASK_MMX) { /* check MMX bit */ |
677 | # endif | 680 | # endif |
678 | ctx->gmult = gcm_gmult_4bit_mmx; | 681 | ctx->gmult = gcm_gmult_4bit_mmx; |
679 | ctx->ghash = gcm_ghash_4bit_mmx; | 682 | ctx->ghash = gcm_ghash_4bit_mmx; |