diff options
Diffstat (limited to 'src/libtls/tls_eap.c')
| -rw-r--r-- | src/libtls/tls_eap.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libtls/tls_eap.c b/src/libtls/tls_eap.c index 8204a3441..2f3627485 100644 --- a/src/libtls/tls_eap.c +++ b/src/libtls/tls_eap.c @@ -303,13 +303,23 @@ METHOD(tls_eap_t, process, status_t, DBG2(DBG_TLS, "received %N acknowledgement packet", eap_type_names, this->type); status = build_pkt(this, pkt->identifier, out); +<<<<<<< HEAD + if (status == INVALID_STATE && + this->tls->is_complete(this->tls)) +======= if (status == INVALID_STATE && this->tls->is_complete(this->tls)) +>>>>>>> upstream/4.5.1 { return SUCCESS; } return status; } status = process_pkt(this, pkt); +<<<<<<< HEAD + if (status != NEED_MORE) + { + return status; +======= switch (status) { case NEED_MORE: @@ -318,6 +328,7 @@ METHOD(tls_eap_t, process, status_t, return this->tls->is_complete(this->tls) ? SUCCESS : FAILED; default: return status; +>>>>>>> upstream/4.5.1 } } status = build_pkt(this, pkt->identifier, out); |