Skip to content

Commit f5fe417

Browse files
committed
Remove client thread mode
1 parent 6e19b35 commit f5fe417

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

ext/openssl/ossl_ssl.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@
2424
# define TO_SOCKET(s) (s)
2525
#endif
2626

27-
#ifndef TYPEOF_TIMEVAL_TV_USEC
28-
# if INT_MAX >= 1000000
29-
# define TYPEOF_TIMEVAL_TV_USEC int
30-
# else
31-
# define TYPEOF_TIMEVAL_TV_USEC long
32-
# endif
33-
#endif
34-
3527
#define GetSSLCTX(obj, ctx) do { \
3628
TypedData_Get_Struct((obj), SSL_CTX, &ossl_sslctx_type, (ctx)); \
3729
} while (0)
@@ -1566,9 +1558,8 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
15661558
#ifdef OSSL_USE_QUIC
15671559
/*
15681560
* call-seq:
1569-
* SSLContext.quic(:client) -> ctx
1570-
* SSLContext.quic(:client_thread) -> ctx
1571-
* SSLContext.quic(:server) -> ctx
1561+
* SSLContext.quic(:client) -> ctx
1562+
* SSLContext.quic(:server) -> ctx
15721563
*
15731564
* Creates a new SSLContext for QUIC. The argument specifies the QUIC mode.
15741565
* Requires OpenSSL 3.2+.
@@ -1587,14 +1578,8 @@ ossl_sslctx_s_quic(VALUE klass, VALUE quic_sym)
15871578

15881579
if (quic_id == rb_intern("client"))
15891580
method = OSSL_QUIC_client_method();
1590-
#ifdef OSSL_USE_QUIC
1591-
else if (quic_id == rb_intern("client_thread"))
1592-
method = OSSL_QUIC_client_thread_method();
1593-
#endif
1594-
#ifdef OSSL_USE_QUIC
15951581
else if (quic_id == rb_intern("server"))
15961582
method = OSSL_QUIC_server_method();
1597-
#endif
15981583
else
15991584
ossl_raise(rb_eArgError, "unknown QUIC mode: %"PRIsVALUE, quic_sym);
16001585

test/openssl/test_quic.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ def test_quic_context_client
1414
assert_predicate ctx, :quic?
1515
end
1616

17-
def test_quic_context_client_thread
18-
pend "QUIC not supported" unless QUIC_SUPPORTED
19-
# :client_thread may not be available on all builds
20-
begin
21-
ctx = OpenSSL::SSL::SSLContext.quic(:client_thread)
22-
assert_equal :client_thread, ctx.quic
23-
assert_predicate ctx, :quic?
24-
rescue OpenSSL::SSL::SSLError
25-
pend "QUIC client_thread method not available"
26-
end
27-
end
28-
2917
def test_quic_context_unknown_mode_raises
3018
pend "QUIC not supported" unless QUIC_SUPPORTED
3119

0 commit comments

Comments
 (0)