fix vax, restructure.

This commit is contained in:
christos 2023-05-11 20:08:59 +00:00
parent 40b8398b3b
commit 2808d7da00
10 changed files with 14 additions and 20 deletions

View File

@ -1,5 +0,0 @@
# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:31:54 christos Exp $
WHRLPOOL_SRCS += wp_block.c
.include "../../whrlpool.inc"

View File

@ -8,4 +8,6 @@ AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
.else .else
.endif .endif
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
.include "../../ec.inc" .include "../../ec.inc"

View File

@ -1,5 +0,0 @@
# $NetBSD: chacha.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
CHACHA_SRCS += chacha_enc.c
.include "../../chacha.inc"

View File

@ -1,5 +0,0 @@
# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
WHRLPOOL_SRCS += wp_block.c
.include "../../whrlpool.inc"

View File

@ -2,5 +2,7 @@
#CRYPTO_SRCS += libc-memequal.c #CRYPTO_SRCS += libc-memequal.c
#CPPFLAGS += -DOPENSSL_CPUID_OBJ #CPPFLAGS += -DOPENSSL_CPUID_OBJ
COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS # no atomic 64 bit ops
.include "../../crypto.inc" .include "../../crypto.inc"

View File

@ -0,0 +1,2 @@
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
.include "../../ec.inc"

View File

@ -1,4 +1,4 @@
.PATH.S: ${.PARSEDIR} .PATH.S: ${.PARSEDIR}
WHRLPOOL_SRCS = wp-x86_64.S WHRLPOOL_SRCS += wp-x86_64.S
WHRLPOOLCPPFLAGS+= -DWHIRLPOOL_ASM WHRLPOOLCPPFLAGS+= -DWHIRLPOOL_ASM
.include "../../whrlpool.inc" .include "../../whrlpool.inc"

View File

@ -1,8 +1,8 @@
# $NetBSD: chacha.inc,v 1.3 2023/05/06 17:07:22 christos Exp $ # $NetBSD: chacha.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/chacha .PATH: ${OPENSSLSRC}/crypto/chacha
CHACHA_SRCS += \ CHACHA_SRCS ?= chacha_enc.c
SRCS += ${CHACHA_SRCS} SRCS += ${CHACHA_SRCS}

View File

@ -1,4 +1,4 @@
# $NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $ # $NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/ec .PATH: ${OPENSSLSRC}/crypto/ec
@ -38,8 +38,10 @@ ecx_meth.c \
.if defined(ECNI) .if defined(ECNI)
COPTS.ecp_nistz256.c+=-Wno-error=stack-protector COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
EC_SRCS+= ecp_nistz256.c EC_SRCS+= ecp_nistz256.c
.if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
.endif .endif
.endif
SRCS += ${EC_SRCS} SRCS += ${EC_SRCS}

View File

@ -1,7 +1,8 @@
# $NetBSD: whrlpool.inc,v 1.3 2023/05/06 17:07:23 christos Exp $ # $NetBSD: whrlpool.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/whrlpool .PATH: ${OPENSSLSRC}/crypto/whrlpool
WHRLPOOL_SRCS ?= wp_block.c
WHRLPOOL_SRCS += \ WHRLPOOL_SRCS += \
wp_dgst.c \ wp_dgst.c \