diff options
| author | David Benjamin <davidben@chromium.org> | 2014-07-03 23:59:49 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-07-08 00:31:37 +0400 |
| commit | 6dbd73db5d58ec44304266012d23ff8d297eca55 (patch) | |
| tree | 3efae2919223544d7cf1f92834d2edc8a4e90a86 /ssl/d1_clnt.c | |
| parent | 31955f91dcdb1a30bc7fd560ee9054321fc514e9 (diff) | |
Remove OPENSSL_NO_TLSEXT compilation option.
Mostly done with unifdef.
Change-Id: I876f79f9e96d77628d696b09694363d07aee6b74
Reviewed-on: https://boringssl-review.googlesource.com/1096
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/d1_clnt.c')
| -rw-r--r-- | ssl/d1_clnt.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 1fbd70bf..2e025722 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -298,7 +298,6 @@ int dtls1_connect(SSL *s) case SSL3_ST_CR_CERT_A: case SSL3_ST_CR_CERT_B: -#ifndef OPENSSL_NO_TLSEXT ret=ssl3_check_finished(s); if (ret <= 0) goto end; if (ret == 2) @@ -311,14 +310,12 @@ int dtls1_connect(SSL *s) s->init_num=0; break; } -#endif /* Check if it is anon DH or PSK */ if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { ret=ssl3_get_server_certificate(s); if (ret <= 0) goto end; -#ifndef OPENSSL_NO_TLSEXT if (s->tlsext_status_expected) s->state=SSL3_ST_CR_CERT_STATUS_A; else @@ -329,13 +326,6 @@ int dtls1_connect(SSL *s) skip = 1; s->state=SSL3_ST_CR_KEY_EXCH_A; } -#else - } - else - skip=1; - - s->state=SSL3_ST_CR_KEY_EXCH_A; -#endif s->init_num=0; break; @@ -474,19 +464,16 @@ int dtls1_connect(SSL *s) else { -#ifndef OPENSSL_NO_TLSEXT /* Allow NewSessionTicket if ticket expected */ if (s->tlsext_ticket_expected) s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A; else -#endif s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A; } s->init_num=0; break; -#ifndef OPENSSL_NO_TLSEXT case SSL3_ST_CR_SESSION_TICKET_A: case SSL3_ST_CR_SESSION_TICKET_B: ret=ssl3_get_new_session_ticket(s); @@ -502,7 +489,6 @@ int dtls1_connect(SSL *s) s->state=SSL3_ST_CR_KEY_EXCH_A; s->init_num=0; break; -#endif case SSL3_ST_CR_FINISHED_A: case SSL3_ST_CR_FINISHED_B: |