aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ossl/master' into mergedmergedKazuki Yamaguchi2016-10-2043-824/+1835
|\
| * Merge branch 'topic/test-static-test-vector'Kazuki Yamaguchi2016-10-174-56/+56
| |\
| | * test/test_pkey_*: refine sign/verify testsKazuki Yamaguchi2016-10-164-56/+56
| * | Make OpenSSL.debug more verboseKazuki Yamaguchi2016-10-161-4/+20
| * | pkey: fix possible memory leak in ossl_pkey_new()Kazuki Yamaguchi2016-10-161-6/+19
| * | pkey: remove unused ossl_pkey_new_from_file() functionKazuki Yamaguchi2016-10-162-22/+0
| * | pkey: fix possible memory leak in PKey#verifyKazuki Yamaguchi2016-10-151-2/+3
| * | ssl: correct return type of SSL_SESSION_get_{time,timeout}()Kazuki Yamaguchi2016-10-151-17/+16
| * | pkey: add missing return value check in PKey#{sign,verify}Kazuki Yamaguchi2016-10-141-8/+18
| * | pkey: tighten buffer size for signatureKazuki Yamaguchi2016-10-144-14/+9
| * | Merge branch 'topic/test-static-test-vector'Kazuki Yamaguchi2016-10-092-263/+218
| |\|
| | * test/test_hmac: use static test vectorsKazuki Yamaguchi2016-10-091-25/+19
| | * test/test_cipher: use static test vectorsKazuki Yamaguchi2016-10-091-238/+199
| * | Merge branch 'topic/pkey-ec-conversion-form'Kazuki Yamaguchi2016-10-093-20/+42
| |\ \
| | * | pkey: allow specifying conversion form in EC::Point#to_bnKazuki Yamaguchi2016-09-283-20/+42
| * | | Add link to the documentation on README.mdKazuki Yamaguchi2016-10-071-7/+2
| | |/ | |/|
| * | cipher: always define Cipher#authenticated?Kazuki Yamaguchi2016-10-042-29/+32
| * | cipher: fix documentation regarding default IVKazuki Yamaguchi2016-10-031-9/+4
| * | Avoid memory leak on rb_str_new()Kazuki Yamaguchi2016-10-034-63/+13
| * | test/test_digest: compare with literalsKazuki Yamaguchi2016-09-283-24/+17
| * | Merge branch 'topic/cipher-no-initialize-null-key'Kazuki Yamaguchi2016-09-282-18/+36
| |\ \
| | * | cipher: don't set dummy encryption key in Cipher#initializeKazuki Yamaguchi2016-09-282-18/+36
| * | | test/test_ssl: suppress syntax warningKazuki Yamaguchi2016-09-281-2/+2
| * | | 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.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 directlyKazuki 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_serverKazuki Yamaguchi2016-09-072-7/+8