diff options
| author |   miod <miod@openbsd.org> | 2016-11-04 18:12:13 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2016-11-04 18:12:13 +0000 |
| commit | 03bebeffa6e8e3d19504e65a7a532c2f88389454 (patch) | |
| tree | 85ba0f16a198ab986ecbf2acbd3b00eb4f509ef5 | |
| parent | make public ASN1_time_parse and ASN1_time_tm_cmp to replace former hidden (diff) | |
| download | wireguard-openbsd-03bebeffa6e8e3d19504e65a7a532c2f88389454.tar.xz wireguard-openbsd-03bebeffa6e8e3d19504e65a7a532c2f88389454.zip | |
Ride the current major bump and enable assembler code for nist 256p curve,
on amd64 only for now. Stanzas to enable it on arm, i386 and sparc64 are
provided but commented out for lack of testing due to the machine room
being currently in storage.
ok jsing@
| -rw-r--r-- | lib/libcrypto/arch/amd64/Makefile.inc | 6 | ||||
| -rw-r--r-- | lib/libcrypto/arch/arm/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libcrypto/arch/i386/Makefile.inc | 6 | ||||
| -rw-r--r-- | lib/libcrypto/arch/sparc64/Makefile.inc | 6 |
4 files changed, 19 insertions, 3 deletions
diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc index 081ed3c252f..8db34d74b00 100644 --- a/lib/libcrypto/arch/amd64/Makefile.inc +++ b/lib/libcrypto/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2015/09/11 14:48:06 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2016/11/04 18:12:13 miod Exp $ # amd64-specific libcrypto build rules @@ -28,6 +28,10 @@ SRCS+= cmll_misc.c SSLASM+= camellia cmll-x86_64 # des SRCS+= des_enc.c fcrypt_b.c +# ec +CFLAGS+= -DECP_NISTZ256_ASM +SRCS+= ecp_nistz256.c +SSLASM+= ec ecp_nistz256-x86_64 # md5 CFLAGS+= -DMD5_ASM SSLASM+= md5 md5-x86_64 diff --git a/lib/libcrypto/arch/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc index 22145a79cc1..76e158660ab 100644 --- a/lib/libcrypto/arch/arm/Makefile.inc +++ b/lib/libcrypto/arch/arm/Makefile.inc @@ -18,6 +18,10 @@ SSLASM+= bn armv4-gf2m SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des SRCS+= des_enc.c fcrypt_b.c +# # ec +# CFLAGS+= -DECP_NISTZ256_ASM +# SRCS+= ecp_nistz256.c +# SSLASM+= ec ecp_nistz256-armv4 # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-armv4 diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc index f4e1f36b1cc..2744da8397a 100644 --- a/lib/libcrypto/arch/i386/Makefile.inc +++ b/lib/libcrypto/arch/i386/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2016/11/04 18:12:13 miod Exp $ # i386-specific libcrypto build rules @@ -25,6 +25,10 @@ SSLASM+= camellia cmll-x86 # des SRCS+= fcrypt_b.c SSLASM+= des des-586 +# # ec +# CFLAGS+= -DECP_NISTZ256_ASM +# SRCS+= ecp_nistz256.c +# SSLASM+= ec ecp_nistz256-x86 # md5 CFLAGS+= -DMD5_ASM SSLASM+= md5 md5-586 diff --git a/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc index e3f217dbb8f..46f79d0f414 100644 --- a/lib/libcrypto/arch/sparc64/Makefile.inc +++ b/lib/libcrypto/arch/sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2016/11/04 18:12:14 miod Exp $ # sparc64-specific libcrypto build rules @@ -18,6 +18,10 @@ SRCS+= des_enc-sparc.S GENERATED+= des_enc-sparc.S des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4 m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET} +# # ec +# CFLAGS+= -DECP_NISTZ256_ASM +# SRCS+= ecp_nistz256.c +# SSLASM+= ec ecp_nistz256-sparcv9 # modes CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-sparcv9 ghash-sparcv9 |