summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-09-27 12:29:31 +0000
committermiod <miod@openbsd.org>2014-09-27 12:29:31 +0000
commite9409066dbe2c5ef6bf1f212c0bc0834a91cdea0 (patch)
tree0bd518bf66e0e00742841bb63a7edc97637b6944 /lib
parentKill rtalloc() and update rtalloc1() and rtalloc_mpath() to no longer (diff)
downloadwireguard-openbsd-e9409066dbe2c5ef6bf1f212c0bc0834a91cdea0.tar.xz
wireguard-openbsd-e9409066dbe2c5ef6bf1f212c0bc0834a91cdea0.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 'lib')
-rw-r--r--lib/libcrypto/arch/hppa/Makefile.inc6
-rw-r--r--lib/libcrypto/crypto/arch/hppa/Makefile.inc6
-rw-r--r--lib/libcrypto/crypto/shlib_version2
-rw-r--r--lib/libcrypto/shlib_version2
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc
index cdf0c360342..dd676462d91 100644
--- a/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2014/05/02 22:23:00 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 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 cdf0c360342..dd676462d91 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.4 2014/05/02 22:23:00 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2014/09/27 12:29:31 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/shlib_version b/lib/libcrypto/crypto/shlib_version
index 079346fa7b1..10f084cda1d 100644
--- a/lib/libcrypto/crypto/shlib_version
+++ b/lib/libcrypto/crypto/shlib_version
@@ -1,2 +1,2 @@
major=30
-minor=0
+minor=1
diff --git a/lib/libcrypto/shlib_version b/lib/libcrypto/shlib_version
index 079346fa7b1..10f084cda1d 100644
--- a/lib/libcrypto/shlib_version
+++ b/lib/libcrypto/shlib_version
@@ -1,2 +1,2 @@
major=30
-minor=0
+minor=1