Skip to content

Unexport run_until and extend bearssl_read function #10

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

Merged
baluchicken merged 1 commit into from
Apr 25, 2024
Merged

Unexport run_until and extend bearssl_read function #10

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/linuxkm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EXPORT_SYMBOL(br_ssl_client_reset);
EXPORT_SYMBOL(br_ssl_engine_recvapp_buf);
EXPORT_SYMBOL(br_ssl_engine_recvapp_ack);
EXPORT_SYMBOL(br_sslio_init);
EXPORT_SYMBOL(br_sslio_run_until);
EXPORT_SYMBOL(br_sslio_read);
EXPORT_SYMBOL(br_sslio_write_all);
EXPORT_SYMBOL(br_sslio_flush);
Expand Down
13 changes: 7 additions & 6 deletions src/ssl/ssl_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@ run_until(br_sslio_context *ctx, unsigned target)
}
}

/* expose run_until, we need it for MSG_PEEK */
int
(*br_sslio_run_until)(br_sslio_context *ctx, unsigned target) = run_until;

/* see bearssl_ssl.h */
int
br_sslio_read(br_sslio_context *ctx, void *dst, size_t len)
Expand All @@ -157,8 +153,13 @@ br_sslio_read(br_sslio_context *ctx, void *dst, size_t len)
if (len == 0) {
return 0;
}
if (run_until(ctx, BR_SSL_RECVAPP) < 0) {
return -1;
int ret = run_until(ctx, BR_SSL_RECVAPP);
if (ret < 0) {
unsigned state = br_ssl_engine_current_state(ctx->engine);
if (state & BR_SSL_CLOSED) {
return 0;
}
return ret;
}
buf = br_ssl_engine_recvapp_buf(ctx->engine, &alen);
if (alen > len) {
Expand Down