summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-09-27 20:42:38 +0000
committermiod <miod@openbsd.org>2014-09-27 20:42:38 +0000
commit9ffb6228728b0b56cc26815b14d8230cbd977714 (patch)
tree6ff142d89363bc3ff642bb46affab34ca5c5cb85
parentDoh, rev 1.4 had left out one routine with both 32-bit and 64-bit code, where (diff)
downloadwireguard-openbsd-9ffb6228728b0b56cc26815b14d8230cbd977714.tar.xz
wireguard-openbsd-9ffb6228728b0b56cc26815b14d8230cbd977714.zip
Revert r1.5 and reenable assembler version of ghash now that it has been
fixed.
-rw-r--r--lib/libcrypto/arch/hppa/Makefile.inc6
-rw-r--r--lib/libcrypto/crypto/arch/hppa/Makefile.inc6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc
index dd676462d91..8f91214a508 100644
--- a/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $
# hppa-specific libcrypto build rules
@@ -15,8 +15,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
# des
SRCS+= des_enc.c fcrypt_b.c
# modes
-#CFLAGS+= -DGHASH_ASM
-#SSLASM+= modes ghash-parisc ghash-parisc
+CFLAGS+= -DGHASH_ASM
+SSLASM+= modes ghash-parisc ghash-parisc
# rc4
.if 0 # about 35% slower than C code
SSLASM+= rc4 rc4-parisc rc4-parisc
diff --git a/lib/libcrypto/crypto/arch/hppa/Makefile.inc b/lib/libcrypto/crypto/arch/hppa/Makefile.inc
index dd676462d91..8f91214a508 100644
--- a/lib/libcrypto/crypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/crypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $
# hppa-specific libcrypto build rules
@@ -15,8 +15,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
# des
SRCS+= des_enc.c fcrypt_b.c
# modes
-#CFLAGS+= -DGHASH_ASM
-#SSLASM+= modes ghash-parisc ghash-parisc
+CFLAGS+= -DGHASH_ASM
+SSLASM+= modes ghash-parisc ghash-parisc
# rc4
.if 0 # about 35% slower than C code
SSLASM+= rc4 rc4-parisc rc4-parisc