diff options
author | doug <> | 2015-07-17 15:50:37 +0000 |
---|---|---|
committer | doug <> | 2015-07-17 15:50:37 +0000 |
commit | 1dfd1cf6c439ce0e41c7f3ac112e6531381c6af7 (patch) | |
tree | feb649947db1c2e92858c29d6aa7029f188bfa9b /src/lib/libssl/s3_lib.c | |
parent | 489dbb57ee3abd9d28ef0c63007d420b6a34b1f4 (diff) | |
download | openbsd-1dfd1cf6c439ce0e41c7f3ac112e6531381c6af7.tar.gz openbsd-1dfd1cf6c439ce0e41c7f3ac112e6531381c6af7.tar.bz2 openbsd-1dfd1cf6c439ce0e41c7f3ac112e6531381c6af7.zip |
Remove compat hack that disabled ECDHE-ECDSA on OS X.
For a few old releases, ECDHE-ECDSA was broken on OS X. This option
cannot differentiate between working and broken OS X so it disabled
ECDHE-ECDSA support on all OS X >= 10.6. 10.8-10.8.3 were the faulty
releases but these are no longer relevant. Tested on OS X 10.10 by jsing.
ok jsing@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index c838409bf7..9167257546 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.97 2015/07/14 05:20:46 doug Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.98 2015/07/17 15:50:37 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -2087,8 +2087,6 @@ ssl3_clear(SSL *s) | |||
2087 | EC_KEY_free(s->s3->tmp.ecdh); | 2087 | EC_KEY_free(s->s3->tmp.ecdh); |
2088 | s->s3->tmp.ecdh = NULL; | 2088 | s->s3->tmp.ecdh = NULL; |
2089 | 2089 | ||
2090 | s->s3->is_probably_safari = 0; | ||
2091 | |||
2092 | rp = s->s3->rbuf.buf; | 2090 | rp = s->s3->rbuf.buf; |
2093 | wp = s->s3->wbuf.buf; | 2091 | wp = s->s3->wbuf.buf; |
2094 | rlen = s->s3->rbuf.len; | 2092 | rlen = s->s3->rbuf.len; |
@@ -2618,12 +2616,6 @@ ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, | |||
2618 | continue; | 2616 | continue; |
2619 | ii = sk_SSL_CIPHER_find(allow, c); | 2617 | ii = sk_SSL_CIPHER_find(allow, c); |
2620 | if (ii >= 0) { | 2618 | if (ii >= 0) { |
2621 | if ((alg_k & SSL_kECDHE) && | ||
2622 | (alg_a & SSL_aECDSA) && s->s3->is_probably_safari) { | ||
2623 | if (!ret) | ||
2624 | ret = sk_SSL_CIPHER_value(allow, ii); | ||
2625 | continue; | ||
2626 | } | ||
2627 | ret = sk_SSL_CIPHER_value(allow, ii); | 2619 | ret = sk_SSL_CIPHER_value(allow, ii); |
2628 | break; | 2620 | break; |
2629 | } | 2621 | } |