Skip to content

Try doing a SSL handshake in tls_handshake_recv #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grk-it wants to merge 1 commit into
base: v3.0.25_foxpass
Choose a base branch
from
Open

Try doing a SSL handshake in tls_handshake_recv #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/main/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,12 +903,14 @@ int tls_handshake_recv(REQUEST *request, tls_session_t *ssn)
record_init(&ssn->dirty_in);
}

err = SSL_read(ssn->ssl, ssn->clean_out.data + ssn->clean_out.used,
sizeof(ssn->clean_out.data) - ssn->clean_out.used);
if (err > 0) {
ssn->clean_out.used += err;
return 1;
}
/*
* Try doing a SSL handshake assuming we have all the data required.
* If not we try to prepare for more application data to be received which is done using `SSL_read`
*/
err = SSL_do_handshake(ssn->ssl);
if (err < 0) {
goto prepare_pending;
}

if (!tls_error_io_log(request, ssn, err, "Failed reading from OpenSSL")) return 0;

Expand Down Expand Up @@ -998,7 +1000,7 @@ int tls_handshake_recv(REQUEST *request, tls_session_t *ssn)
#else
#error You must use a newer version of OpenSSL
#endif

prepare_pending:
err = BIO_ctrl_pending(ssn->from_ssl);
if (err > 0) {
err = BIO_read(ssn->from_ssl, ssn->dirty_out.data,
Expand Down