Disable ec assembly for amd64 pending fixes for ssh, and bump

majors appropriately

4 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 8db34d74b0..c254e59fe2 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2016/11/04 18:12:13 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2016/11/11 03:49:14 beck Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -29,9 +29,9 @@ SSLASM+= camellia cmll-x86_64
 # des
 SRCS+= des_enc.c fcrypt_b.c
 # ec
-CFLAGS+= -DECP_NISTZ256_ASM
-SRCS+=  ecp_nistz256.c
-SSLASM+= ec ecp_nistz256-x86_64
+#CFLAGS+= -DECP_NISTZ256_ASM
+#SRCS+= ecp_nistz256.c
+#SSLASM+= ec ecp_nistz256-x86_64
 # md5
 CFLAGS+= -DMD5_ASM
 SSLASM+= md5 md5-x86_64
diff --git a/src/lib/libcrypto/shlib_version b/src/lib/libcrypto/shlib_version
index 8ee32caa65..e696dee87b 100644
--- a/src/lib/libcrypto/shlib_version
+++ b/src/lib/libcrypto/shlib_version
@@ -1,3 +1,3 @@
 # Don't forget to give libssl and libtls the same type of bump!
-major=39
-minor=1
+major=40
+minor=0
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version
index 3a4ff8b8f0..417efb750a 100644
--- a/src/lib/libssl/shlib_version
+++ b/src/lib/libssl/shlib_version
@@ -1,3 +1,3 @@
 # Don't forget to give libtls the same type of bump!
-major=40
-minor=1
+major=41
+minor=0
diff --git a/src/lib/libtls/shlib_version b/src/lib/libtls/shlib_version
index eb2c603aec..262f3bc13b 100644
--- a/src/lib/libtls/shlib_version
+++ b/src/lib/libtls/shlib_version
@@ -1,2 +1,2 @@
-major=12
-minor=1
+major=13
+minor=0