aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [DOC] replace Fixnum with Integer [ci skip]nobu2016-10-281-1/+1
* Merge changes from Ruby trunk r56173..r56225Kazuki Yamaguchi2016-09-251-1/+1
|\
| * fid typos [ci skip]nobu2016-09-251-1/+1
* | Merge branch 'topic/pkey-key-without-parameters-null-deref'Kazuki Yamaguchi2016-09-232-0/+47
|\ \
| * | pkey: make PKey#verify check the existence of the public keyKazuki Yamaguchi2016-09-232-0/+47
|/ /
* | test/test_asn1: remove pointless begin-endKazuki Yamaguchi2016-09-221-193/+117
* | asn1: remove dead codeKazuki Yamaguchi2016-09-221-37/+0
* | asn1: avoid SYM2ID on runtimeKazuki Yamaguchi2016-09-221-58/+45
* | asn1: fix error path in ossl_asn1_default_tag()Kazuki Yamaguchi2016-09-221-7/+4
* | asn1: don't use assert() in decode_bool()Kazuki Yamaguchi2016-09-221-6/+5
|/
* Merge changes from Ruby trunk r56028..r56173Kazuki Yamaguchi2016-09-171-1/+5
|\
| * * ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix compile errorngoto2016-09-171-1/+5
| * openssl: workaround for Ubuntu's patched OpenSSLrhe2016-09-171-2/+5
| * openssl: import v2.0.0.beta.2rhe2016-09-1710-967/+790
* | tool/sync-with-trunk: rebase onto the last merge commit rather than HEADKazuki Yamaguchi2016-09-171-15/+18
* | test/test_ssl: fix test_ctx_optionsKazuki Yamaguchi2016-09-171-2/+2
* | test/test_ssl: workaround for Ubuntu patch for SSL_CTX_*_optionsKazuki Yamaguchi2016-09-131-2/+5
* | ssl: fix comments so that RDoc can find SSLContext#servername_cbKazuki Yamaguchi2016-09-091-12/+8
* | Use rb_obj_class() instead of CLASS_OF()Kazuki Yamaguchi2016-09-086-19/+18
* | Ruby/OpenSSL 2.0.0.beta.2v2.0.0.beta.2Kazuki Yamaguchi2016-09-081-1/+1
* | Remove trailing spacesKazuki Yamaguchi2016-09-082-7/+7
* | Remove unneeded workaround for dependKazuki Yamaguchi2016-09-071-3/+1
* | Merge branch 'topic/pkey-ec-unlink'Kazuki Yamaguchi2016-09-072-279/+192
|\ \
| * | pkey: make OpenSSL::PKey::EC::Group wrap an EC_GROUP directlytopic/pkey-ec-unlinkKazuki Yamaguchi2016-09-072-107/+54
| * | pkey: make OpenSSL::PKey::EC::Point wrap an EC_POINT directlyKazuki Yamaguchi2016-09-071-64/+55
| * | pkey: make ossl_pkey_ec.c follow the common macro namingKazuki Yamaguchi2016-09-071-127/+102
* | | Merge branch 'topic/ssl-test-cleanup'Kazuki Yamaguchi2016-09-074-545/+324
|\ \ \ | |/ / |/| |
| * | test/utils: remove use_anon_cipher option from SSLTestCase#start_servertopic/ssl-test-cleanupKazuki Yamaguchi2016-09-072-7/+8
| * | test/test_ssl: refactor SNI testsKazuki Yamaguchi2016-09-071-169/+40
| * | test/test_pair: extract IO-like methods tests from test_ssl.rbKazuki Yamaguchi2016-09-072-97/+45
| * | test/test_ssl: move DH and ECDH tests from test_pair.rbKazuki Yamaguchi2016-09-072-141/+117
| * | test/test_ssl: simplify SSL context options testsKazuki Yamaguchi2016-09-071-53/+18
| * | test/test_ssl: test SSLSocket#{cert,peer_cert,peer_cert_chain}Kazuki Yamaguchi2016-09-071-11/+29
| * | test/test_ssl: remove 'STARTTLS' code from test/utils.rbKazuki Yamaguchi2016-09-072-27/+35
| * | test/utils: make SSLTestCase#start_server take keyword argumentsKazuki Yamaguchi2016-09-073-50/+42
|/ /
* | Merge branch 'topic/pkcs12-read-no-private-key'Kazuki Yamaguchi2016-09-052-9/+117
|\ \
| * | pkcs12: fix .new to handle strucuture with no keys or no certstopic/pkcs12-read-no-private-keyKazuki Yamaguchi2016-09-052-9/+117
|/ /
* | Merge branch 'topic/ssl-eliminate-init-vars'Kazuki Yamaguchi2016-09-022-119/+113
|\ \
| * | ssl: eliminate SSLContext::INIT_VARStopic/ssl-eliminate-init-varsKazuki Yamaguchi2016-09-022-114/+112
| * | ssl: hide callback_state from RubyKazuki Yamaguchi2016-09-021-1/+1
| * | ssl: don't store selected {EC,}DH parameter in an instance variableKazuki Yamaguchi2016-09-021-4/+0
|/ /
* | test/test_ssl: fix test_alpn_protocol_selection_cancel againKazuki Yamaguchi2016-08-301-2/+2
* | ssl: check return value of SSL_CTX_set_alpn_protos()Kazuki Yamaguchi2016-08-301-1/+5
* | ssl: catch exceptions raised in ALPN/NPN callbacksKazuki Yamaguchi2016-08-302-15/+48
|/
* Merge changes from Ruby trunk r55822..r56028Kazuki Yamaguchi2016-08-291-3/+3
|\
| * * remove trailing spaces.svn2016-08-291-3/+3
|/
* Merge pull request #69 from ruby/linkify-historyKazuki Yamaguchi2016-08-291-11/+21
|\
| * Revert "Add #18 to History"Zachary Scott2016-08-291-2/+0
| * Add #18 to HistoryZachary Scott2016-08-291-0/+2
| * Missed 2 more links! :bomb: [ci skip]Zachary Scott2016-08-291-2/+4