diff options
author | Trevor Perrin <unsafe@trevp.net> | 2013-07-27 23:10:14 -0700 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2013-07-31 14:29:41 +0100 |
commit | 0b2bde70dd8fc290d640ed64cf7609dc2963a48b (patch) | |
tree | 70693fd57b9dbe0b6151c57c3d0b11d32a82c148 /ssl/s23_clnt.c | |
parent | a898936218bc279b5d7cdf76d58a25e7a2d419cb (diff) |
Various custom extension fixes.
Force no SSL2 when custom extensions in use.
Don't clear extension state when cert is set.
Clear on renegotiate.
Diffstat (limited to 'ssl/s23_clnt.c')
-rw-r--r-- | ssl/s23_clnt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 2c38b1a76a..15da654bf1 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -340,7 +340,9 @@ static int ssl23_client_hello(SSL *s) if (s->ctx->tlsext_opaque_prf_input_callback != 0 || s->tlsext_opaque_prf_input != NULL) ssl2_compat = 0; #endif - if (s->ctx->tlsext_authz_server_audit_proof_cb != NULL) + if (s->ctx->tlsext_authz_server_audit_proof_cb != NULL) + ssl2_compat = 0; + if (s->ctx->custom_cli_ext_records_count != 0) ssl2_compat = 0; } #endif |