forked from pool/openssl
984610bf7f
I also submitted libcamgm that matches this submit - suse_version 10.1 & 10.2 x86_64 can not enable-ec_nistp_64_gcc_128 - openssl-1.0.1i-noec2m-fix.patch: only report the Elliptic Curves we actually support (not the binary ones) (bnc#905037) - openSUSE < 11.2 doesn't have accept4() - openSSL 1.0.1j * Fix SRTP Memory Leak (CVE-2014-3513) * Session Ticket Memory Leak (CVE-2014-3567) * Add SSL 3.0 Fallback protection (TLS_FALLBACK_SCSV) * Build option no-ssl3 is incomplete (CVE-2014-3568) OBS-URL: https://build.opensuse.org/request/show/264696 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=123
60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
From 90fec44393443f93d6f7fb00662472bb2a8a6c9b Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Mon, 10 Nov 2014 23:42:50 +0000
|
|
Subject: [PATCH] Added OPENSSL_NO_EC2M guards around the preferred EC curve
|
|
list
|
|
|
|
---
|
|
ssl/t1_lib.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
|
|
index d6aff4b..8dafc6e 100644
|
|
--- a/ssl/t1_lib.c
|
|
+++ b/ssl/t1_lib.c
|
|
@@ -204,28 +204,40 @@ static int nid_list[] =
|
|
|
|
static int pref_list[] =
|
|
{
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect571r1, /* sect571r1 (14) */
|
|
NID_sect571k1, /* sect571k1 (13) */
|
|
+#endif
|
|
NID_secp521r1, /* secp521r1 (25) */
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect409k1, /* sect409k1 (11) */
|
|
NID_sect409r1, /* sect409r1 (12) */
|
|
+#endif
|
|
NID_secp384r1, /* secp384r1 (24) */
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect283k1, /* sect283k1 (9) */
|
|
NID_sect283r1, /* sect283r1 (10) */
|
|
+#endif
|
|
NID_secp256k1, /* secp256k1 (22) */
|
|
NID_X9_62_prime256v1, /* secp256r1 (23) */
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect239k1, /* sect239k1 (8) */
|
|
NID_sect233k1, /* sect233k1 (6) */
|
|
NID_sect233r1, /* sect233r1 (7) */
|
|
+#endif
|
|
NID_secp224k1, /* secp224k1 (20) */
|
|
NID_secp224r1, /* secp224r1 (21) */
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect193r1, /* sect193r1 (4) */
|
|
NID_sect193r2, /* sect193r2 (5) */
|
|
+#endif
|
|
NID_secp192k1, /* secp192k1 (18) */
|
|
NID_X9_62_prime192v1, /* secp192r1 (19) */
|
|
+#ifndef OPENSSL_NO_EC2M
|
|
NID_sect163k1, /* sect163k1 (1) */
|
|
NID_sect163r1, /* sect163r1 (2) */
|
|
NID_sect163r2, /* sect163r2 (3) */
|
|
+#endif
|
|
NID_secp160k1, /* secp160k1 (15) */
|
|
NID_secp160r1, /* secp160r1 (16) */
|
|
NID_secp160r2, /* secp160r2 (17) */
|
|
--
|
|
2.1.0
|
|
|
|
|