From 15ab81987c18dd77372bb5bdd8b201d0aa2f72b3 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sat, 27 Sep 2014 20:42:38 +0000
Subject: Revert r1.5 and reenable assembler version of ghash now that it has
 been fixed.

---
 src/lib/libcrypto/arch/hppa/Makefile.inc        | 6 +++---
 src/lib/libcrypto/crypto/arch/hppa/Makefile.inc | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index dd676462d9..8f91214a50 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/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/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
index dd676462d9..8f91214a50 100644
--- a/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc
+++ b/src/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
-- 
cgit v1.2.3-55-g6feb