diff options
author | miod <> | 2014-09-27 12:29:31 +0000 |
---|---|---|
committer | miod <> | 2014-09-27 12:29:31 +0000 |
commit | 4417c3b663faa9ba2df0679c98296e60d4b3d91c (patch) | |
tree | b367647c4d7c4e2b0080e6e9c68b76587bda1aa2 /src/lib/libcrypto/crypto | |
parent | 7f0d86e56a07e6231d5e17e51ff5df4387001c7c (diff) | |
download | openbsd-4417c3b663faa9ba2df0679c98296e60d4b3d91c.tar.gz openbsd-4417c3b663faa9ba2df0679c98296e60d4b3d91c.tar.bz2 openbsd-4417c3b663faa9ba2df0679c98296e60d4b3d91c.zip |
Disable assembler code for ghash on hppa, causes wrong computations in some
cases and breaks TLS 1.2; crank libcrypto.so minor version out of safety and
to be able to tell broken versions apart easily.
Diffstat (limited to 'src/lib/libcrypto/crypto')
-rw-r--r-- | src/lib/libcrypto/crypto/arch/hppa/Makefile.inc | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto/shlib_version | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/crypto/arch/hppa/Makefile.inc index cdf0c36034..dd676462d9 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.4 2014/05/02 22:23:00 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 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/shlib_version b/src/lib/libcrypto/crypto/shlib_version index 079346fa7b..10f084cda1 100644 --- a/src/lib/libcrypto/crypto/shlib_version +++ b/src/lib/libcrypto/crypto/shlib_version | |||
@@ -1,2 +1,2 @@ | |||
1 | major=30 | 1 | major=30 |
2 | minor=0 | 2 | minor=1 |