summaryrefslogtreecommitdiff
path: root/OpenSSL
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/OP_SINGLE_ECDH_USEAkihiro Yamazaki2015-09-066-524/+81
|\
| * Merge branch 'master' into flake8-tsafeHynek Schlawack2015-09-051-21/+26
| |\
| | * Make flake8 happy about test_rand.pyHynek Schlawack2015-09-051-21/+26
| * | flake8 tsafe.pyHynek Schlawack2015-09-051-3/+4
| |/
| * Merge branch 'master' into other-flake8Alex Gaynor2015-09-051-144/+19
| |\
| | * flake8 a bunch of stuffAlex Gaynor2015-09-051-144/+19
| * | flake8 another fileAlex Gaynor2015-09-051-228/+28
| |/
| * Merge branch 'master' into flake8++Alex Gaynor2015-09-052-29/+1
| |\
| | * cleanup suggested by @reaperhulkAlex Gaynor2015-09-052-3/+1
| | * Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-051-29/+6
| | |\
| | * \ Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-054-29/+0
| | |\ \
| | * \ \ Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-051-2/+3
| | |\ \ \
| | * \ \ \ Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-057-29/+44
| | |\ \ \ \
| | * | | | | Fixed #322 -- removed code that already exists in cryptographyAlex Gaynor2015-09-041-28/+2
| * | | | | | almost 100% flake8-ification of SSL.pyAlex Gaynor2015-09-051-99/+3
| | |_|_|_|/ | |/| | | |
* | | | | | fix build errorAkihiro Yamazaki2015-09-061-1/+1
* | | | | | add OP_SINGLE_ECDH_USEAkihiro Yamazaki2015-09-051-0/+1
|/ / / / /
* | | | | More flake8-ificationAlex Gaynor2015-09-051-29/+6
| |_|_|/ |/| | |
* | | | Merge branch 'master' into flake8Alex Gaynor2015-09-051-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Make flake8 happy in test_utilHynek Schlawack2015-09-051-2/+3
| | |/ | |/|
* | | Start whacking at newline counts for flake8Alex Gaynor2015-09-054-29/+0
|/ /
* | a random set of flake8 and typo fixesAlex Gaynor2015-09-046-10/+11
* | flake8 fixesAlex Gaynor2015-09-041-8/+8
* | flake8 fixAlex Gaynor2015-09-041-1/+1
* | Merge pull request #310 from kjav/patch-1Hynek Schlawack2015-09-042-1/+15
|\ \
| * | Added test for getattr changeskjav2015-09-021-0/+11
| * | getattr now works when no socket is wrappedkjav2015-09-021-1/+4
* | | Fixed some more flake8 errorsAlex Gaynor2015-09-041-10/+10
| |/ |/|
* | Fixed several flake8 errorsAlex Gaynor2015-09-041-4/+4
* | Removed some unused codeAlex Gaynor2015-09-041-6/+1
* | Removed an unused import and fixed formattingAlex Gaynor2015-09-041-2/+2
* | Removed duplicate and unused importsAlex Gaynor2015-09-041-3/+1
* | Removed some semi-colonsAlex Gaynor2015-09-041-2/+2
* | Fixed a test to really check what it was supposed toAlex Gaynor2015-09-041-1/+1
|/
* always use alpn decoratorMaximilian Hils2015-08-261-3/+1
* add ssl_peek functionalityMaximilian Hils2015-08-172-7/+36
* fic race condition in testsMaximilian Hils2015-07-251-4/+8
* Clean up X509StoreContext documentationStephen Holsapple2015-06-101-12/+21
* Fixed test_ssl.py. Branches got mixed.Jim Shaver2015-05-291-1/+1
* fix grammar and english in SSL.py and ssl.rstJim Shaver2015-05-282-2/+2
* Switch get_protocol_version_name back to unicode.Jim Shaver2015-05-282-5/+6
* Fixing the truth in Changelog SSL.py and test_ssl.pyJim Shaver2015-05-282-12/+14
* Added string() to get_protocol_version_nameJim Shaver2015-05-271-1/+1
* differentiated the two functions. Updated docs, and testsJim Shaver2015-05-272-7/+22
* Fix docstring in SSL.pyJim Shaver2015-05-271-1/+1
* Make variable assignment in tests more readableJim Shaver2015-05-271-2/+2
* Added changelog, entry fixed bracketsJim Shaver2015-05-271-1/+1
* modified ssl_version ->ssl_get_version and modified test, docsJim Shaver2015-05-271-4/+4
* switch to SSL_get_version.Jim Shaver2015-05-272-3/+15
* Add support for querying the negotiated TLS version.Richard J. Moore2015-05-272-0/+25