Skip to content

Add SSLSocket server handshake aliases #1094

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

Draft
samuel-williams-shopify wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Draft

Add SSLSocket server handshake aliases #1094

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
2 changes: 2 additions & 0 deletions ext/openssl/ossl_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3171,6 +3171,8 @@ Init_ossl_ssl(void)
rb_define_method(cSSLSocket, "connect_nonblock", ossl_ssl_connect_nonblock, -1);
rb_define_method(cSSLSocket, "accept", ossl_ssl_accept, 0);
rb_define_method(cSSLSocket, "accept_nonblock", ossl_ssl_accept_nonblock, -1);
rb_define_alias(cSSLSocket, "start", "accept");
rb_define_alias(cSSLSocket, "start_nonblock", "accept_nonblock");
rb_define_method(cSSLSocket, "sysread", ossl_ssl_read, -1);
rb_define_private_method(cSSLSocket, "sysread_nonblock", ossl_ssl_read_nonblock, -1);
rb_define_method(cSSLSocket, "syswrite", ossl_ssl_write, 1);
Expand Down
11 changes: 11 additions & 0 deletions test/openssl/test_ssl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
if defined?(OpenSSL::SSL)

class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_server_handshake_aliases
assert_equal(
OpenSSL::SSL::SSLSocket.instance_method(:accept),
OpenSSL::SSL::SSLSocket.instance_method(:start),
)
assert_equal(
OpenSSL::SSL::SSLSocket.instance_method(:accept_nonblock),
OpenSSL::SSL::SSLSocket.instance_method(:start_nonblock),
)
end

def test_bad_socket
bad_socket = Struct.new(:sync).new
assert_raise TypeError do
Expand Down
Loading