aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-v0.6.7' into releasev0.6.7Steven Fackler2015-10-1413-15/+153
|\
| * Release v0.6.7Steven Fackler2015-10-145-8/+8
| * Merge pull request #288 from alexcrichton/includeSteven Fackler2015-10-141-0/+1
| |\
| | * Add metadata for the include dir of opensslAlex Crichton2015-10-131-0/+1
| * | Revert "Merge pull request #280 from ltratt/libressl_build"Steven Fackler2015-10-143-4/+4
| * | Merge pull request #289 from larsbergstrom/version_fixupSteven Fackler2015-10-141-2/+2
| |\ \ | | |/ | |/|
| | * Update OpenSSL version checks to 1.0 numbers instead of 0.10 numbersLars Bergstrom2015-10-141-2/+2
| |/
| * Merge pull request #286 from jedisct1/use_certificate_chainSteven Fackler2015-10-132-0/+11
| |\
| | * Add set_certificate_chain_file()Frank Denis2015-10-122-0/+11
| * | Merge pull request #284 from bheart/cfb-modeSteven Fackler2015-10-123-1/+86
| |\ \
| | * | AES CFB{1,8,128} mode supportWill Tange2015-10-113-1/+86
| * | | Merge pull request #287 from radare/patch-1Steven Fackler2015-10-121-4/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Add certs.pem in cert probe listradare2015-10-121-4/+8
| |/ /
| * | Merge pull request #280 from ltratt/libressl_buildSteven Fackler2015-10-103-4/+4
| |\ \
| | * | Fix build on LibreSSL.Laurence Tratt2015-10-033-4/+4
| * | | Merge pull request #277 from nixpulvis/read_public_pemSteven Fackler2015-10-103-0/+37
| |\ \ \
| | * | | Add public key PEM read function.Nathan Lilienthal2015-10-013-0/+37
| * | | | Merge branch 'release'Steven Fackler2015-10-055-8/+8
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'release-v0.6.6' into releasev0.6.6Steven Fackler2015-10-0516-143/+547
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Release v0.6.6Steven Fackler2015-10-055-8/+8
| |/ / /
| * | | Clean up init stuffSteven Fackler2015-10-052-9/+8
| * | | Merge pull request #282 from Manishearth/threadidSteven Fackler2015-10-052-0/+29
| |\ \ \ | | |_|/ | |/| |
| | * | Set threadid_func on linux/osx (fixes #281)Manish Goregaokar2015-10-052-0/+29
| |/ /
| * | Merge pull request #279 from jtdowney/sslv23_docsSteven Fackler2015-10-021-1/+2
| |\ \ | | |/ | |/|
| | * Update documentation about SSLv23John Downey2015-10-021-1/+2
| |/
| * Merge pull request #263 from jedisct1/ecdh_autoSteven Fackler2015-09-265-0/+23
| |\
| | * Add an ecdh_auto descriptionFrank Denis2015-09-251-0/+4
| | * Add SSL::set_ecdh_auto()Frank Denis2015-09-255-0/+19
| |/
| * Merge pull request #273 from alexcrichton/test-on-windowsSteven Fackler2015-09-227-97/+190
| |\
| | * Enable testing on Windows via AppVeyorAlex Crichton2015-09-227-97/+190
| |/
| * Merge pull request #266 from jmesmon/alpnSteven Fackler2015-09-163-8/+54
| |\
| | * ssl/alpn: test mismatch between protocols resulting in NoneCody P Schafer2015-09-161-0/+43
| | * ssl/npn+alpn: adjust protocol selection to fail if no protocols matchCody P Schafer2015-09-012-5/+8
| | * openssl/ssl: fix some of the comment text where I missed replacing NPN with ALPNCody P Schafer2015-09-011-3/+3
| * | Merge pull request #261 from jedisct1/try_ssl_nullSteven Fackler2015-09-162-28/+7
| |\ \
| | * | Use try_ssl_null!() when relevantFrank Denis2015-09-132-28/+7
| * | | Merge pull request #262 from jedisct1/read_dhparamsSteven Fackler2015-09-163-2/+37
| |\ \ \ | | |/ / | |/| |
| | * | Add DH::from_pem() to load DH parameters from a fileFrank Denis2015-09-133-2/+37
| |/ /
| * | Merge pull request #270 from mvdnes/crypto_segvSteven Fackler2015-09-111-7/+67
| |\ \
| | * | Fix one call to RSA_size found by testsMathijs van de Nes2015-09-111-1/+1
| | * | Add tests to ensure a panic occurs instead of segvMathijs van de Nes2015-09-111-0/+32
| | * | Check rsa.is_null() before passing it to RSA_sizeMathijs van de Nes2015-09-101-1/+22
| | * | Check _fromstr function for successMathijs van de Nes2015-09-101-6/+13
| * | | Merge pull request #268 from alex/patch-1Steven Fackler2015-09-091-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Make the docs say that load_pub/save_pub methods take DER bytesAlex Gaynor2015-09-091-2/+2
| |/ /
| * | Merge pull request #265 from alexcrichton/swap-orderSteven Fackler2015-09-011-3/+3
| |\ \ | | |/ | |/|
| | * Swap order of linking ssl/cryptoAlex Crichton2015-09-011-3/+3
| |/
| * Merge pull request #259 from jedisct1/dhSteven Fackler2015-09-018-2/+141
| |\
| | * Add support for set_tmp_dh() and RFC5114 DH parameters for forward secrecy.Frank Denis2015-08-318-2/+141
| * | Merge branch 'release'Steven Fackler2015-08-315-7/+7
| |\ \ | |/ / |/| / | |/