From f98f9081dc5689f2816bf2082b4f59f3c6d65494 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 15 Apr 2023 18:23:54 +0000
Subject: Stop building GF2m assembly

GF2m support will be removed shortly. In the interim drop some of this
unused code already and let it fall back to the C implementation.

ok jsing
---
 src/lib/libcrypto/arch/amd64/Makefile.inc | 4 +---
 src/lib/libcrypto/arch/arm/Makefile.inc   | 2 --
 src/lib/libcrypto/arch/i386/Makefile.inc  | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index e9c7732691..a181d05d90 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2023/02/16 11:13:05 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2023/04/15 18:23:54 tb Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -24,8 +24,6 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn x86_64-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT5
 SSLASM+= bn x86_64-mont5
-CFLAGS+= -DOPENSSL_BN_ASM_GF2m
-SSLASM+= bn x86_64-gf2m
 
 # bn s2n-bignum
 SRCS += bn_arch.c
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index c4e47c2dab..6e776df34d 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -11,8 +11,6 @@ SRCS+= bf_enc.c
 # bn
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn armv4-mont
-CFLAGS+= -DOPENSSL_BN_ASM_GF2m
-SSLASM+= bn armv4-gf2m
 # camellia
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # des
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 6134dfdc15..a01fcb3af6 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2023/02/22 05:57:19 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2023/04/15 18:23:54 tb Exp $
 
 # i386-specific libcrypto build rules
 
@@ -20,8 +20,6 @@ SSLASM+= bn bn-586
 SSLASM+= bn co-586
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 SSLASM+= bn x86-mont
-CFLAGS+= -DOPENSSL_BN_ASM_GF2m
-SSLASM+= bn x86-gf2m
 # camellia
 SSLASM+= camellia cmll-x86
 # des
-- 
cgit v1.2.3-55-g6feb