Skip to content

Fix compiling with OpenSSL #7621

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 1 commit into from
Apr 17, 2026
Merged

Fix compiling with OpenSSL #7621

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
19 changes: 11 additions & 8 deletions crates/stdlib/src/openssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ mod _ssl {
};
use crate::{
common::lock::{
PyMappedRwLockReadGuard, PyMutex, PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard,
LazyLock, PyMappedRwLockReadGuard, PyMutex, PyRwLock, PyRwLockReadGuard,
PyRwLockWriteGuard,
},
socket::{self, PySocket},
vm::{
Expand Down Expand Up @@ -1046,7 +1047,7 @@ mod _ssl {

#[pymethod]
fn set_ciphers(&self, cipherlist: PyStrRef, vm: &VirtualMachine) -> PyResult<()> {
let ciphers = cipherlist.as_str();
let ciphers: &str = cipherlist.as_ref();
if ciphers.contains('\0') {
return Err(exceptions::cstring_error(vm));
}
Expand Down Expand Up @@ -1102,7 +1103,8 @@ mod _ssl {
// Convert name to CString, supporting both str and bytes
let name_cstr = match name {
Either::A(s) => {
if s.as_str().contains('\0') {
let s: &str = s.as_ref();
if s.contains('\0') {
return Err(exceptions::cstring_error(vm));
}
s.to_cstring(vm)?
Expand Down Expand Up @@ -1459,7 +1461,7 @@ mod _ssl {
}
*self.psk_server_callback.lock() = Some(callback);
if let OptionalArg::Present(hint) = identity_hint {
*self.psk_identity_hint.lock() = Some(hint.as_str().to_owned());
*self.psk_identity_hint.lock() = Some(hint.to_string());
}
// Note: The actual callback will be invoked via SSL app_data mechanism
}
Expand Down Expand Up @@ -1487,7 +1489,8 @@ mod _ssl {
if let Some(cadata) = args.cadata {
let (certs, is_pem) = match cadata {
Either::A(s) => {
if !s.as_str().is_ascii() {
let s: &str = s.as_ref();
if !s.is_ascii() {
return Err(invalid_cadata(vm));
}
(X509::stack_from_pem(s.as_bytes()), true)
Expand Down Expand Up @@ -1977,7 +1980,7 @@ mod _ssl {
use crate::vm::builtins::{PyByteArray, PyBytes, PyStr};

if let Some(s) = obj.downcast_ref::<PyStr>() {
Ok(s.as_str().as_bytes().to_vec())
Ok(s.as_bytes().to_vec())
} else if let Some(b) = obj.downcast_ref::<PyBytes>() {
Ok(b.as_bytes().to_vec())
} else if let Some(ba) = obj.downcast_ref::<PyByteArray>() {
Expand Down Expand Up @@ -2033,7 +2036,7 @@ mod _ssl {

// Configure server hostname
if let Some(hostname) = &server_hostname {
let hostname_str = hostname.as_str();
let hostname_str: &str = hostname.as_ref();
if hostname_str.is_empty() || hostname_str.starts_with('.') {
return Err(vm.new_value_error(
"server_hostname cannot be an empty string or start with a leading dot.",
Expand Down Expand Up @@ -2752,7 +2755,7 @@ mod _ssl {
) -> PyResult<Option<PyBytesRef>> {
const CB_MAXLEN: usize = 512;

let cb_type_str = cb_type.as_ref().map_or("tls-unique", |s| s.as_str());
let cb_type_str = cb_type.as_ref().map_or("tls-unique", |s| s.as_ref());

if cb_type_str != "tls-unique" {
return Err(vm.new_value_error(format!(
Expand Down
Loading