summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2014-05-02 20:08:10 +0000
committermiod <>2014-05-02 20:08:10 +0000
commit054b188c5e8b1faeb8a4a3e563cf909eedfa5551 (patch)
treeca14145d5a5526c07b9f755fb6adb06e1a462c76
parent9b91067767652b8b5119230a0a75c4b09267511d (diff)
downloadopenbsd-054b188c5e8b1faeb8a4a3e563cf909eedfa5551.tar.gz
openbsd-054b188c5e8b1faeb8a4a3e563cf909eedfa5551.tar.bz2
openbsd-054b188c5e8b1faeb8a4a3e563cf909eedfa5551.zip
Reenable assembler code for SHA384 and SHA512 now that it no longer miscomputes
things. Worth doing as it's twice faster than the C code.
-rw-r--r--src/lib/libcrypto/arch/hppa/Makefile.inc6
-rw-r--r--src/lib/libcrypto/crypto/arch/hppa/Makefile.inc6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index 30e0dbce5f..2d95d638e3 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/05/02 18:21:39 miod Exp $ 1# $OpenBSD: Makefile.inc,v 1.3 2014/05/02 20:08:10 miod Exp $
2 2
3# hppa-specific libcrypto build rules 3# hppa-specific libcrypto build rules
4 4
@@ -29,8 +29,8 @@ CFLAGS+= -DSHA1_ASM
29SSLASM+= sha sha1-parisc sha1-parisc 29SSLASM+= sha sha1-parisc sha1-parisc
30CFLAGS+= -DSHA256_ASM 30CFLAGS+= -DSHA256_ASM
31SSLASM+= sha sha512-parisc sha256-parisc 31SSLASM+= sha sha512-parisc sha256-parisc
32#CFLAGS+= -DSHA512_ASM 32CFLAGS+= -DSHA512_ASM
33#SSLASM+= sha sha512-parisc sha512-parisc 33SSLASM+= sha sha512-parisc sha512-parisc
34# whrlpool 34# whrlpool
35SRCS+= wp_block.c 35SRCS+= wp_block.c
36 36
diff --git a/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
index 30e0dbce5f..2d95d638e3 100644
--- a/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/05/02 18:21:39 miod Exp $ 1# $OpenBSD: Makefile.inc,v 1.3 2014/05/02 20:08:10 miod Exp $
2 2
3# hppa-specific libcrypto build rules 3# hppa-specific libcrypto build rules
4 4
@@ -29,8 +29,8 @@ CFLAGS+= -DSHA1_ASM
29SSLASM+= sha sha1-parisc sha1-parisc 29SSLASM+= sha sha1-parisc sha1-parisc
30CFLAGS+= -DSHA256_ASM 30CFLAGS+= -DSHA256_ASM
31SSLASM+= sha sha512-parisc sha256-parisc 31SSLASM+= sha sha512-parisc sha256-parisc
32#CFLAGS+= -DSHA512_ASM 32CFLAGS+= -DSHA512_ASM
33#SSLASM+= sha sha512-parisc sha512-parisc 33SSLASM+= sha sha512-parisc sha512-parisc
34# whrlpool 34# whrlpool
35SRCS+= wp_block.c 35SRCS+= wp_block.c
36 36