Skip to content

Share more ssl consts and fix openssl #6462

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
youknowone merged 4 commits into from
Dec 20, 2025
Merged

Share more ssl consts and fix openssl #6462

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98b966a
Reuse SSL error names
youknowone Dec 19, 2025
07f4427
Share ssl error codes
youknowone Dec 19, 2025
c03be46
fix ssl
youknowone Dec 20, 2025
4949d39
fix openssl
youknowone Dec 19, 2025
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
Prev Previous commit
Next Next commit
fix ssl
  • Loading branch information
@youknowone
youknowone committed Dec 20, 2025
commit c03be46d5687f6bcb4f9c9191e5572d771b94dbf
15 changes: 14 additions & 1 deletion crates/stdlib/src/ssl/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,8 +1397,21 @@ pub(super) fn ssl_read(
return Ok(n);
}

// No plaintext available and cannot read more TLS records
// No plaintext available and rustls doesn't want to read more TLS records
if !needs_more_tls {
// Check if connection needs to write data first (e.g., TLS key update, renegotiation)
// This mirrors the handshake logic which checks both wants_read() and wants_write()
if conn.wants_write() && !is_bio {
// Flush pending TLS data before continuing
let tls_data = ssl_write_tls_records(conn)?;
if !tls_data.is_empty() {
socket.sock_send(tls_data, vm).map_err(SslError::Py)?;
}
// After flushing, rustls may want to read again - continue loop
continue;
}

// BIO mode: check for EOF
if is_bio && let Some(bio_obj) = socket.incoming_bio() {
let is_eof = bio_obj
.get_attr("eof", vm)
Expand Down