From e32e86852841c9b5fd2bcaa740f0f22cfaa3b3e5 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 23 Jul 2020 19:19:33 +0000
Subject: [PATCH] modules/crypto: disable optimized assembly skein1024
 implementation

It is presumably broken in the same way as userland skein1024 (see r363454)

PR:		248221
---
 sys/modules/crypto/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 28243fa9245c..8af02c35ce0e 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -28,14 +28,14 @@ SRCS	+= sha1.c sha256c.c sha512c.c
 SRCS	+= skein.c skein_block.c
 # unroll the 256 and 512 loops, half unroll the 1024
 CFLAGS.skein_block.c	+= -DSKEIN_LOOP=995
-.if exists(${MACHINE_ARCH}/skein_block_asm.S)
-.PATH:	${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
-SRCS	+= skein_block_asm.S
-CFLAGS	+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792
-ACFLAGS	+= -DELF -Wa,--noexecstack
-# Fully unroll all loops in the assembly optimized version
-ACFLAGS	+= -DSKEIN_LOOP=0
-.endif
+#.if exists(${MACHINE_ARCH}/skein_block_asm.S)
+#.PATH:	${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
+#SRCS	+= skein_block_asm.S
+#CFLAGS	+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792
+#ACFLAGS	+= -DELF -Wa,--noexecstack
+## Fully unroll all loops in the assembly optimized version
+#ACFLAGS	+= -DSKEIN_LOOP=0
+#.endif
 SRCS	+= siphash.c
 SRCS	+= gmac.c gfmult.c
 SRCS	+= blake2b-ref.c