summaryrefslogtreecommitdiff
path: root/OpenSSL
Commit message (Expand)AuthorAgeFilesLines
* Prepare 0.15.1Hynek Schlawack2015-04-141-1/+1
* don't panic if there's no errnoGlyph2015-04-141-1/+1
* A more precise test with less I/O.Glyph2015-04-141-6/+15
* Test the right error.Glyph2015-04-141-0/+11
* Release 0.15Hynek Schlawack2015-04-141-1/+1
* Merge pull request #218 from exarkun/npn_feature_detectPaul Kehrer2015-04-132-120/+168
|\
| * merge masterJean-Paul Calderone2015-04-136-8/+552
| |\
| * | Test NotImplementedError works.Cory Benfield2015-04-131-135/+164
| * | Docstring for decorator.Cory Benfield2015-04-131-0/+4
| * | Use a decorator for requires_npnCory Benfield2015-04-131-9/+15
| * | Add NPN feature detection.Cory Benfield2015-04-131-0/+9
* | | Fix weird spacing change.Jean-Paul Calderone2015-04-131-4/+1
* | | merge masterJean-Paul Calderone2015-04-136-8/+551
|\ \ \ | | |/ | |/|
| * | Merge master again!Jean-Paul Calderone2015-04-132-3/+363
| |\ \
| | * | Unrolling loops like I'm GCCCory Benfield2015-04-131-13/+9
| | * | Cleanup docstrings and comments.Cory Benfield2015-04-131-2/+4
| | * | Remove 'test that'.Cory Benfield2015-04-131-8/+8
| | * | Multiline docstring.Cory Benfield2015-04-131-1/+3
| | * | Test for absent ALPN.Cory Benfield2015-04-131-0/+22
| | * | ALPN required decorator docstring.Cory Benfield2015-04-131-0/+4
| | * | Better names and spacing.Cory Benfield2015-04-131-3/+3
| | * | Technically it's an initialism.Cory Benfield2015-04-131-2/+2
| | * | Use ALPN detection decorator.Cory Benfield2015-04-131-9/+15
| | * | Skip tests on non-ALPN platforms.Cory Benfield2015-04-131-129/+136
| | * | Raise NotImplementedError if no ALPN.Cory Benfield2015-04-131-0/+12
| | * | Handle exceptions in ALPN select callback.Cory Benfield2015-04-132-35/+88
| | * | Catch non-bytestrings from ALPN callbacks.Cory Benfield2015-04-131-0/+4
| | * | Fixup broken ALPN tests.Cory Benfield2015-04-131-9/+3
| | * | Further CFFI problems.Cory Benfield2015-04-131-3/+3
| | * | Fixup some CFFI problems.Cory Benfield2015-04-131-2/+2
| | * | Test for client-only ALPN.Cory Benfield2015-04-131-0/+35
| | * | Minor nits.Cory Benfield2015-04-131-12/+12
| | * | Add ALPN support.Cory Benfield2015-04-132-1/+226
| | |/
| * | Rename warn_text to something a little more descriptive.Jean-Paul Calderone2015-04-133-10/+11
| * | Fix wrapping and typo in warning name.Jean-Paul Calderone2015-04-131-2/+2
| * | Remove unused import.Jean-Paul Calderone2015-04-131-1/+1
| * | Remove accidental space.Jean-Paul Calderone2015-04-131-2/+0
| * | merge master, resolve simple conflictsJean-Paul Calderone2015-04-1310-185/+1170
| |\ \ | | |/
| * | One more.Jean-Paul Calderone2015-03-291-1/+1
| * | And Python 3.2 compatibility.Jean-Paul Calderone2015-03-291-5/+5
| * | I mean Python 2.6.Jean-Paul Calderone2015-03-293-17/+17
| * | I mean Python 2.6 compatible.Jean-Paul Calderone2015-03-291-1/+1
| * | Use a spelling that is Python 2.6 compatible.Jean-Paul Calderone2015-03-291-2/+2
| * | Remove the deprecation for this parameter that represents a path name.Jean-Paul Calderone2015-03-292-24/+0
| * | docstringJean-Paul Calderone2015-03-291-0/+12
| * | Factor the warning code into a shared helper. Remove some of the unnecessary...Jean-Paul Calderone2015-03-296-144/+119
| * | Tests for added backward compatibility in crypto.pyAbraham Martin2015-03-253-9/+97
| * | Tests for added backward compatibility in SSL.pyAbraham Martin2015-03-251-0/+60
| * | Reuse six importsAbraham Martin2015-03-252-18/+17
| * | Use six library to check python versionAbraham Martin2015-03-252-34/+19