diff options
| author |   miod <miod@openbsd.org> | 2014-12-07 15:45:44 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-12-07 15:45:44 +0000 |
| commit | eed3fad3f38ec11c3ea6cce04c13fdae5d1c8e64 (patch) | |
| tree | ea1db9f6f0c2d87bb29c0b6f15fb2f6b6ca33a42 | |
| parent | Remove OPENSSL_FIPSCANISTER mentions. (diff) | |
| download | wireguard-openbsd-eed3fad3f38ec11c3ea6cce04c13fdae5d1c8e64.tar.xz wireguard-openbsd-eed3fad3f38ec11c3ea6cce04c13fdae5d1c8e64.zip | |
Revert to the use of C code for the basic BN routines (bn_add_words,
bn_div_words, bn_mul_add_words, bn_mul_words, bn_sqr_words, bn_sub_words)
on sgi, because the generated assembly code isn't R4000-safe.
| -rw-r--r-- | lib/libcrypto/arch/mips64/Makefile.inc | 9 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/arch/mips64/Makefile.inc | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc index 3b8f01e41cc..b6fc8971e7b 100644 --- a/lib/libcrypto/arch/mips64/Makefile.inc +++ b/lib/libcrypto/arch/mips64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2014/11/17 20:31:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2014/12/07 15:45:44 miod Exp $ # mips64-specific libcrypto build rules @@ -9,9 +9,14 @@ SSLASM+= aes aes-mips aes-mips # bf SRCS+= bf_enc.c # bn +.if ${MACHINE} == "sgi" # because of R4000 support +SRCS+= bn_asm.c +.else SSLASM+= bn mips bn-mips +CFLAGS+= -DBN_DIV3W +.endif SSLASM+= bn mips-mont mips-mont -CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV3W +CFLAGS+= -DOPENSSL_BN_ASM_MONT # camellia SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des diff --git a/lib/libcrypto/crypto/arch/mips64/Makefile.inc b/lib/libcrypto/crypto/arch/mips64/Makefile.inc index 3b8f01e41cc..b6fc8971e7b 100644 --- a/lib/libcrypto/crypto/arch/mips64/Makefile.inc +++ b/lib/libcrypto/crypto/arch/mips64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2014/11/17 20:31:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2014/12/07 15:45:44 miod Exp $ # mips64-specific libcrypto build rules @@ -9,9 +9,14 @@ SSLASM+= aes aes-mips aes-mips # bf SRCS+= bf_enc.c # bn +.if ${MACHINE} == "sgi" # because of R4000 support +SRCS+= bn_asm.c +.else SSLASM+= bn mips bn-mips +CFLAGS+= -DBN_DIV3W +.endif SSLASM+= bn mips-mont mips-mont -CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV3W +CFLAGS+= -DOPENSSL_BN_ASM_MONT # camellia SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des |