summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2025-05-24 07:51:21 +0000
committerjsing <>2025-05-24 07:51:21 +0000
commitc7d7f1dea0ae42e051dcbd16f06057143223136d (patch)
treedec5961e9579b30c95b881087436acd482ce581e
parent2299509fcd21601d1e6577c4dfe2a503c2586f09 (diff)
downloadopenbsd-c7d7f1dea0ae42e051dcbd16f06057143223136d.tar.gz
openbsd-c7d7f1dea0ae42e051dcbd16f06057143223136d.tar.bz2
openbsd-c7d7f1dea0ae42e051dcbd16f06057143223136d.zip
Mop up ghash arm assembly remnants.
-rw-r--r--src/lib/libcrypto/modes/gcm128.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c
index 7c69a5afc9..3b2cf754ba 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.47 2025/05/22 12:44:14 jsing Exp $ */ 1/* $OpenBSD: gcm128.c,v 1.48 2025/05/24 07:51:21 jsing 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 *
@@ -264,14 +264,6 @@ void gcm_gmult_4bit_x86(uint64_t Xi[2], const u128 Htable[16]);
264void gcm_ghash_4bit_x86(uint64_t Xi[2], const u128 Htable[16], const uint8_t *inp, 264void gcm_ghash_4bit_x86(uint64_t Xi[2], const u128 Htable[16], const uint8_t *inp,
265 size_t len); 265 size_t len);
266# endif 266# endif
267# elif defined(__arm__) || defined(__arm)
268# include "arm_arch.h"
269# if __ARM_ARCH__>=7 && !defined(__STRICT_ALIGNMENT)
270# define GHASH_ASM_ARM
271void gcm_gmult_neon(uint64_t Xi[2], const u128 Htable[16]);
272void gcm_ghash_neon(uint64_t Xi[2], const u128 Htable[16], const uint8_t *inp,
273 size_t len);
274# endif
275# endif 267# endif
276#endif 268#endif
277 269
@@ -316,15 +308,6 @@ CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
316 ctx->gmult = gcm_gmult_4bit; 308 ctx->gmult = gcm_gmult_4bit;
317 ctx->ghash = gcm_ghash_4bit; 309 ctx->ghash = gcm_ghash_4bit;
318# endif 310# endif
319# elif defined(GHASH_ASM_ARM)
320 if (OPENSSL_armcap_P & ARMV7_NEON) {
321 ctx->gmult = gcm_gmult_neon;
322 ctx->ghash = gcm_ghash_neon;
323 } else {
324 gcm_init_4bit(ctx->Htable, ctx->H.u);
325 ctx->gmult = gcm_gmult_4bit;
326 ctx->ghash = gcm_ghash_4bit;
327 }
328# else 311# else
329 gcm_init_4bit(ctx->Htable, ctx->H.u); 312 gcm_init_4bit(ctx->Htable, ctx->H.u);
330 ctx->gmult = gcm_gmult_4bit; 313 ctx->gmult = gcm_gmult_4bit;