summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2014-04-14 21:54:29 +0000
committersthen <sthen@openbsd.org>2014-04-14 21:54:29 +0000
commit0ecc35414a5b1d26ab8e9087e05c3d1def373a90 (patch)
tree44979d70d0e763e8a82342c69595ffa212a2e56e
parentswitch to using common SetList code (this fixes the xfont sets btw) (diff)
downloadwireguard-openbsd-0ecc35414a5b1d26ab8e9087e05c3d1def373a90.tar.xz
wireguard-openbsd-0ecc35414a5b1d26ab8e9087e05c3d1def373a90.zip
revert 1.2 and define OPENSSL_NO_EC_NISTP_64_GCC_128 again, it has a downside
(breaks ssh ecdsa keys)
-rw-r--r--lib/libcrypto/arch/amd64/opensslconf.h3
-rw-r--r--lib/libcrypto/crypto/arch/amd64/opensslconf.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/libcrypto/arch/amd64/opensslconf.h b/lib/libcrypto/arch/amd64/opensslconf.h
index 4d68fa2cc68..f969fd75e49 100644
--- a/lib/libcrypto/arch/amd64/opensslconf.h
+++ b/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/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/lib/libcrypto/crypto/arch/amd64/opensslconf.h
index 4d68fa2cc68..f969fd75e49 100644
--- a/lib/libcrypto/crypto/arch/amd64/opensslconf.h
+++ b/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