Skip to content

Implement more SSL methods #6210

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 22 commits into from
Oct 26, 2025
Merged

Implement more SSL methods #6210

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6af5fa8
openssl-sys version
youknowone Oct 23, 2025
b6a1272
selected_alpn_protocol
youknowone Oct 23, 2025
02d49fa
get_ciphers
youknowone Oct 23, 2025
1878e3d
get_channel_binding
youknowone Oct 23, 2025
0f68a42
Add Tls1_1 and Tls1_2
youknowone Oct 23, 2025
b64fdd7
consts
youknowone Oct 23, 2025
666381a
fix ssl truncate bug
youknowone Oct 23, 2025
efddfce
verify_flags
youknowone Oct 23, 2025
a262e85
shared ciphers
youknowone Oct 23, 2025
97f11dc
verify_client_post_handshake
youknowone Oct 23, 2025
5b2b64c
shutdown
youknowone Oct 23, 2025
6abf7f1
get_verified_chain
youknowone Oct 23, 2025
c3dad1d
fix lints
youknowone Oct 25, 2025
68f8655
fix _wrap_socket
youknowone Oct 24, 2025
9ddd43c
Fix convert_openssl_error
youknowone Oct 24, 2025
fa54752
clean up ssl
youknowone Oct 24, 2025
04f2b0a
X509_check_ca
youknowone Oct 25, 2025
e568f49
set default verify flag
youknowone Oct 25, 2025
9fa10eb
Fix version
youknowone Oct 25, 2025
b030e1a
fix import
youknowone Oct 25, 2025
422ea8c
consts
youknowone Oct 25, 2025
91df67c
fix httplib
youknowone Oct 26, 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 lints
  • Loading branch information
@youknowone
youknowone committed Oct 25, 2025
commit c3dad1d12875c9c4bb490033ac882681d6905a6c
35 changes: 15 additions & 20 deletions stdlib/src/ssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ mod _ssl {
socket::{self, PySocket},
vm::{
Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
builtins::{PyBaseExceptionRef, PyBytesRef, PyListRef, PyStrRef, PyType, PyTypeRef, PyWeak},
builtins::{
PyBaseExceptionRef, PyBytesRef, PyListRef, PyStrRef, PyType, PyTypeRef, PyWeak,
},
class_or_notimplemented,
convert::{ToPyException, ToPyObject},
exceptions,
Expand Down Expand Up @@ -583,7 +585,7 @@ mod _ssl {
#[pymethod]
fn get_ciphers(&self, vm: &VirtualMachine) -> PyResult<PyListRef> {
let ctx = self.ctx();
let ssl = ssl::Ssl::new(&*ctx).map_err(|e| convert_openssl_error(vm, e))?;
let ssl = ssl::Ssl::new(&ctx).map_err(|e| convert_openssl_error(vm, e))?;

unsafe {
let ciphers_ptr = SSL_get_ciphers(ssl.as_ptr());
Expand Down Expand Up @@ -701,21 +703,17 @@ mod _ssl {
let clear = flags & !new_flags;
let set = !flags & new_flags;

if clear != 0 {
if sys::X509_VERIFY_PARAM_clear_flags(param, clear) == 0 {
return Err(vm.new_exception_msg(
ssl_error(vm),
"Failed to clear verify flags".to_owned(),
));
}
if clear != 0 && sys::X509_VERIFY_PARAM_clear_flags(param, clear) == 0 {
return Err(vm.new_exception_msg(
ssl_error(vm),
"Failed to clear verify flags".to_owned(),
));
}
if set != 0 {
if sys::X509_VERIFY_PARAM_set_flags(param, set) == 0 {
return Err(vm.new_exception_msg(
ssl_error(vm),
"Failed to set verify flags".to_owned(),
));
}
if set != 0 && sys::X509_VERIFY_PARAM_set_flags(param, set) == 0 {
return Err(vm.new_exception_msg(
ssl_error(vm),
"Failed to set verify flags".to_owned(),
));
}
Ok(())
}
Expand Down Expand Up @@ -1356,10 +1354,7 @@ mod _ssl {

if ret < 0 {
// Error occurred
let err = unsafe {
let err_code = sys::SSL_get_error(ssl_ptr, ret);
err_code
};
let err = unsafe { sys::SSL_get_error(ssl_ptr, ret) };

if err == sys::SSL_ERROR_WANT_READ || err == sys::SSL_ERROR_WANT_WRITE {
// Non-blocking would block - this is okay for shutdown
Expand Down
Loading