Date: Thu, 23 Jul 2020 19:19:33 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363455 - head/sys/modules/crypto Message-ID: <202007231919.06NJJX3p096666@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Jul 23 19:19:33 2020 New Revision: 363455 URL: https://svnweb.freebsd.org/changeset/base/363455 Log: modules/crypto: disable optimized assembly skein1024 implementation It is presumably broken in the same way as userland skein1024 (see r363454) PR: 248221 Modified: head/sys/modules/crypto/Makefile Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Thu Jul 23 18:55:47 2020 (r363454) +++ head/sys/modules/crypto/Makefile Thu Jul 23 19:19:33 2020 (r363455) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007231919.06NJJX3p096666>