Skip to content

Commit cbfedbf

Browse files
headiusheadius
authored
Merge pull request jruby#9323 from kares/bump-jossl
[deps] bump jruby-openssl to latest
2 parents b32dc12 + cc079e1 commit cbfedbf

12 files changed

Lines changed: 9 additions & 78 deletions

File tree

‎lib/pom.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def log(message = nil)
5252
['irb', '1.14.3'],
5353
['jar-dependencies', '0.5.4'],
5454
['jruby-readline', '1.3.7'],
55-
['jruby-openssl', '0.15.5'],
55+
['jruby-openssl', '0.15.6'],
5656
['json', '2.16.0'],
5757
['logger', '1.6.4'],
5858
['net-http', '0.6.0'],

‎lib/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ DO NOT MODIFY - GENERATED CODE
320320
<dependency>
321321
<groupId>rubygems</groupId>
322322
<artifactId>jruby-openssl</artifactId>
323-
<version>0.15.5</version>
323+
<version>0.15.6</version>
324324
<type>gem</type>
325325
<scope>provided</scope>
326326
<exclusions>
@@ -1166,7 +1166,7 @@ DO NOT MODIFY - GENERATED CODE
11661166
<include>specifications/irb-1.14.3*</include>
11671167
<include>specifications/jar-dependencies-0.5.4*</include>
11681168
<include>specifications/jruby-readline-1.3.7*</include>
1169-
<include>specifications/jruby-openssl-0.15.5*</include>
1169+
<include>specifications/jruby-openssl-0.15.6*</include>
11701170
<include>specifications/json-2.16.0*</include>
11711171
<include>specifications/logger-1.6.4*</include>
11721172
<include>specifications/net-http-0.6.0*</include>
@@ -1250,7 +1250,7 @@ DO NOT MODIFY - GENERATED CODE
12501250
<include>gems/irb-1.14.3*/**/*</include>
12511251
<include>gems/jar-dependencies-0.5.4*/**/*</include>
12521252
<include>gems/jruby-readline-1.3.7*/**/*</include>
1253-
<include>gems/jruby-openssl-0.15.5*/**/*</include>
1253+
<include>gems/jruby-openssl-0.15.6*/**/*</include>
12541254
<include>gems/json-2.16.0*/**/*</include>
12551255
<include>gems/logger-1.6.4*/**/*</include>
12561256
<include>gems/net-http-0.6.0*/**/*</include>
@@ -1334,7 +1334,7 @@ DO NOT MODIFY - GENERATED CODE
13341334
<include>cache/irb-1.14.3*</include>
13351335
<include>cache/jar-dependencies-0.5.4*</include>
13361336
<include>cache/jruby-readline-1.3.7*</include>
1337-
<include>cache/jruby-openssl-0.15.5*</include>
1337+
<include>cache/jruby-openssl-0.15.6*</include>
13381338
<include>cache/json-2.16.0*</include>
13391339
<include>cache/logger-1.6.4*</include>
13401340
<include>cache/net-http-0.6.0*</include>
@@ -1418,7 +1418,7 @@ DO NOT MODIFY - GENERATED CODE
14181418
<include>extensions/universal-java/3.4.0/irb-1.14.3/*</include>
14191419
<include>extensions/universal-java/3.4.0/jar-dependencies-0.5.4/*</include>
14201420
<include>extensions/universal-java/3.4.0/jruby-readline-1.3.7/*</include>
1421-
<include>extensions/universal-java/3.4.0/jruby-openssl-0.15.5/*</include>
1421+
<include>extensions/universal-java/3.4.0/jruby-openssl-0.15.6/*</include>
14221422
<include>extensions/universal-java/3.4.0/json-2.16.0/*</include>
14231423
<include>extensions/universal-java/3.4.0/logger-1.6.4/*</include>
14241424
<include>extensions/universal-java/3.4.0/net-http-0.6.0/*</include>

‎test/mri/excludes/OpenSSL/TestASN1.rb‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
exclude :test_basic_asn1data, "work in progress"
22
exclude :test_basic_constructed, "work in progress"
3-
exclude :test_basic_primitive, "work in progress"
4-
exclude :test_bit_string_infinite_length, 'encoding works but decoding not implemented'
5-
exclude :test_bitstring, "work in progress"
6-
exclude :test_cons_explicit_tagging, 'needs investigation'
7-
exclude :test_cons_implicit_tagging, 'needs investigation'
8-
exclude :test_cons_without_array_forbidden, 'needs investigation'
9-
exclude :test_create_inf_length_primitive, 'needs investigation'
103
exclude :test_decode_constructed_overread, "work in progress"
11-
exclude :test_decode_x509_certificate, "work in progress"
124
exclude :test_end_of_content, "work in progress"
135
exclude :test_object_identifier, "work in progress"
14-
exclude :test_octet_string_constructed_tagging, "work in progress"
15-
exclude :test_octet_string_infinite_length_explicit_tagging, 'needs investigation'
16-
exclude :test_octet_string_infinite_length_implicit_tagging, 'needs investigation'
17-
exclude :test_prim_implicit_tagging, 'needs investigation'
186
exclude :test_recursive_octet_string_indefinite_length, "work in progress"
19-
exclude :test_recursive_octet_string_infinite_length, 'needs investigation'
20-
exclude :test_recursive_octet_string_parse, 'needs investigation'
7+
exclude :test_recursive_octet_string_parse, "work in progress"
218
exclude :test_sequence, "work in progress"
229
exclude :test_set, "work in progress"
23-
exclude :test_string_basic, "work in progress"

‎test/mri/excludes/OpenSSL/TestCipher.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
exclude :test_AES, 'works - just need to enable JCE unlimited strength'
2-
exclude :test_AES_crush, 'needs investigation'
31
exclude :test_aes_gcm, "work in progress"
42
exclude :test_ciphers, "work in progress"
53
exclude :test_crypt_after_key, "work in progress"

‎test/mri/excludes/OpenSSL/TestEC.rb‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
exclude :test_ECPrivateKey, "work in progress"
2-
exclude :test_ECPrivateKey_encrypted, "work in progress"
3-
exclude :test_PUBKEY, "work in progress"
41
exclude :test_check_key, "work in progress"
5-
exclude :test_derive_key, "TODO: OpenSSL::PKey::EC#derive not yet implemented"
6-
exclude :test_dh_compute_key, "work in progress"
7-
exclude :test_dsa_sign_asn1_FIPS186_3, "work in progress"
8-
exclude :test_ec_group, "work in progress"
9-
exclude :test_ec_key, "work in progress"
102
exclude :test_ec_point, "work in progress"
113
exclude :test_ec_point_add, "work in progress"
124
exclude :test_ec_point_mul, "work in progress"
13-
exclude :test_generate_key, "work in progress"
145
exclude :test_sign_verify_raw, "work in progress"

‎test/mri/excludes/OpenSSL/TestPKey.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
exclude :test_s_generate_key, "work in progress"
66
exclude :test_s_generate_parameters, "work in progress"
77
exclude :test_s_generate_parameters_with_block, "work in progress"
8-
exclude :test_x25519, "work in progress"

‎test/mri/excludes/OpenSSL/TestPKeyDSA.rb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
exclude :test_dup, 'passes except for setting (invalid) `key2.p + 1` as validation happens early'
2-
exclude :test_export_password_length, 'needs investigation'
32
exclude :test_new_break, 'needs investigation'
4-
exclude :test_sign_verify, "work in progress"
5-
exclude :test_sign_verify_raw, "TODO: sign_raw not implemented"
3+
exclude :test_sign_verify_raw, "work in progress"

‎test/mri/excludes/OpenSSL/TestPKeyRSA.rb‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
exclude :test_dup, "work in progress"
21
exclude :test_encrypt_decrypt, "work in progress"
32
exclude :test_encrypt_decrypt_legacy, "work in progress"
4-
exclude :test_export, "work in progress"
5-
exclude :test_export_password_length, 'needs investigation'
63
exclude :test_new_break, 'needs investigation'
74
exclude :test_pem_passwd, "work in progress"
8-
exclude :test_private_encoding, "work in progress"
95
exclude :test_private_encoding_encrypted, "work in progress"
10-
exclude :test_read_private_key_pem_pw, 'needs investigation'
116
exclude :test_sign_verify_memory_leak, 'depends on GC.start forcing GC and changing memory size (e.g. RSS)'
12-
exclude :test_sign_verify_options, "work in progress"
13-
exclude :test_sign_verify_pss, "work in progress"
147
exclude :test_sign_verify_raw, "work in progress"
15-
exclude :test_to_der, "work in progress"

‎test/mri/excludes/OpenSSL/TestSSL.rb‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,18 @@
1111
exclude :test_connect_certificate_verify_failed_exception_message, "work in progress"
1212
exclude :test_connect_works_when_setting_dh_callback_to_nil, "work in progress"
1313
exclude :test_ctx_options_config, "work in progress"
14-
exclude :test_ctx_setup_invalid, 'works sufficiently - low priority'
1514
exclude :test_dup, "work in progress"
1615
exclude :test_ecdh_curves_tls12, "work in progress"
1716
exclude :test_ecdh_curves_tls13, "work in progress"
1817
exclude :test_exception_in_verify_callback_is_ignored, "work in progress"
1918
exclude :test_export_keying_material, "work in progress"
2019
exclude :test_finished_messages, 'hangs for a long time and then fails'
21-
exclude :test_freeze_calls_setup, "work in progress"
2220
exclude :test_get_ephemeral_key, "work in progress"
23-
exclude :test_getbyte, "work in progress"
2421
exclude :test_keylog_cb, "work in progress"
25-
exclude :test_npn_advertised_protocol_too_long, 'SSLContext#npn_protocols= not supported'
26-
exclude :test_npn_protocol_selection_ary, 'SSLContext#npn_protocols= not supported'
27-
exclude :test_npn_protocol_selection_cancel, 'SSLContext#npn_protocols= not supported'
28-
exclude :test_npn_protocol_selection_enum, 'SSLContext#npn_protocols= not supported'
29-
exclude :test_npn_selected_protocol_too_long, 'SSLContext#npn_protocols= not supported'
30-
exclude :test_options_defaults_to_OP_ALL_on, 'needs investigation'
31-
exclude :test_options_setting_nil_means_all, 'needs investigation'
3222
exclude :test_post_connect_check_with_anon_ciphers, 'needs investigation'
33-
exclude :test_read_nonblock_without_session, 'HANGS'
3423
exclude :test_readbyte, "work in progress"
35-
exclude :test_renegotiation_cb, 'SSLContext#renegotiation_cb= not supported'
3624
exclude :test_security_level, "work in progress"
37-
exclude :test_servername_cb, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
38-
exclude :test_servername_cb_calls_setup_on_returned_ctx, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
39-
exclude :test_servername_cb_can_return_nil, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
40-
exclude :test_servername_cb_raises_an_exception_on_unknown_objects, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
41-
exclude :test_servername_cb_sets_context_on_the_socket, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
42-
exclude :test_socket_close_write, "work in progress"
43-
exclude :test_ssl_sysread_blocking_error, 'works except JRuby-OpenSSL does not raise TypeError on SSLSocket#sysread(4, exception: false)'
25+
exclude :test_servername_cb_raises_an_exception_on_unknown_objects, "work in progress"
4426
exclude :test_ssl_with_server_cert, "work in progress"
4527
exclude :test_sslctx_set_params, "work in progress"
4628
exclude :test_tlsext_hostname, "work in progress"

‎test/mri/excludes/OpenSSL/TestX509Certificate.rb‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
exclude :test_aia, "work in progress"
21
exclude :test_akiski, "work in progress"
3-
exclude :test_crl_uris, "work in progress"
42
exclude :test_crl_uris_multiple_general_names, "work in progress"
53
exclude :test_crl_uris_no_uris, "work in progress"
6-
exclude :test_eq, "work in progress"
7-
exclude :test_extension, "work in progress"
8-
exclude :test_invalid_extension, "work in progress"
94
exclude :test_load_file_certificate_der, "work in progress"
105
exclude :test_load_file_empty_pem, "work in progress"
116
exclude :test_load_file_fullchain_garbage, "work in progress"
127
exclude :test_load_file_fullchain_pem, "work in progress"
138
exclude :test_read_der_then_pem, "work in progress"
149
exclude :test_sign_and_verify_ed25519, "work in progress"
15-
exclude :test_tbs_precert_bytes, "work in progress"

0 commit comments

Comments
 (0)