From 8716039eddb50304567f2a79faacbc911fffe88e Mon Sep 17 00:00:00 2001
From: sthen <>
Date: Mon, 14 Apr 2014 21:54:29 +0000
Subject: revert 1.2 and define OPENSSL_NO_EC_NISTP_64_GCC_128 again, it has a
 downside (breaks ssh ecdsa keys)

---
 src/lib/libcrypto/arch/amd64/opensslconf.h        | 3 +++
 src/lib/libcrypto/crypto/arch/amd64/opensslconf.h | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h
index 4d68fa2cc6..f969fd75e4 100644
--- a/src/lib/libcrypto/arch/amd64/opensslconf.h
+++ b/src/lib/libcrypto/arch/amd64/opensslconf.h
@@ -8,6 +8,9 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_CMS
 # define OPENSSL_NO_CMS
 #endif
diff --git a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
index 4d68fa2cc6..f969fd75e4 100644
--- a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
@@ -8,6 +8,9 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_CMS
 # define OPENSSL_NO_CMS
 #endif
-- 
cgit v1.2.3-55-g6feb