diff options
| author | miod <> | 2014-09-27 20:42:38 +0000 |
|---|---|---|
| committer | miod <> | 2014-09-27 20:42:38 +0000 |
| commit | 15ab81987c18dd77372bb5bdd8b201d0aa2f72b3 (patch) | |
| tree | 448c69f4913d13b60828587bb8080b29bd1b4c52 /src/lib | |
| parent | 865b44a8032d259b4341d1f439ecc4e650704163 (diff) | |
| download | openbsd-15ab81987c18dd77372bb5bdd8b201d0aa2f72b3.tar.gz openbsd-15ab81987c18dd77372bb5bdd8b201d0aa2f72b3.tar.bz2 openbsd-15ab81987c18dd77372bb5bdd8b201d0aa2f72b3.zip | |
Revert r1.5 and reenable assembler version of ghash now that it has been
fixed.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/arch/hppa/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/arch/hppa/Makefile.inc | 6 |
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 dd676462d9..8f91214a50 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.5 2014/09/27 12:29:31 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $ |
| 2 | 2 | ||
| 3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -15,8 +15,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W | |||
| 15 | # des | 15 | # des |
| 16 | SRCS+= des_enc.c fcrypt_b.c | 16 | SRCS+= des_enc.c fcrypt_b.c |
| 17 | # modes | 17 | # modes |
| 18 | #CFLAGS+= -DGHASH_ASM | 18 | CFLAGS+= -DGHASH_ASM |
| 19 | #SSLASM+= modes ghash-parisc ghash-parisc | 19 | SSLASM+= modes ghash-parisc ghash-parisc |
| 20 | # rc4 | 20 | # rc4 |
| 21 | .if 0 # about 35% slower than C code | 21 | .if 0 # about 35% slower than C code |
| 22 | SSLASM+= rc4 rc4-parisc rc4-parisc | 22 | 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 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.6 2014/09/27 20:42:38 miod Exp $ |
| 2 | 2 | ||
| 3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -15,8 +15,8 @@ CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W | |||
| 15 | # des | 15 | # des |
| 16 | SRCS+= des_enc.c fcrypt_b.c | 16 | SRCS+= des_enc.c fcrypt_b.c |
| 17 | # modes | 17 | # modes |
| 18 | #CFLAGS+= -DGHASH_ASM | 18 | CFLAGS+= -DGHASH_ASM |
| 19 | #SSLASM+= modes ghash-parisc ghash-parisc | 19 | SSLASM+= modes ghash-parisc ghash-parisc |
| 20 | # rc4 | 20 | # rc4 |
| 21 | .if 0 # about 35% slower than C code | 21 | .if 0 # about 35% slower than C code |
| 22 | SSLASM+= rc4 rc4-parisc rc4-parisc | 22 | SSLASM+= rc4 rc4-parisc rc4-parisc |