summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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-1314-218/+1331
| |\ \ | |/ / |/| |
* | | Merge pull request #210 from reaperhulk/docker-travisJean-Paul Calderone2015-04-131-27/+49
|\ \ \
| * | | review fixesPaul Kehrer2015-04-131-38/+17
| * | | travis docker support + osx support ~~madness~~Paul Kehrer2015-04-131-36/+79
| | * | 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
| | * | Different warning messages for different versions of PythonAbraham Martin2015-03-252-11/+52
| | * | Emit proper warningsAbraham Martin2015-03-252-8/+10
| | * | Fix regressions in support for bytes / unicodeAbraham Martin2015-02-042-0/+48
| | | * Pass the correct type to CRL.export.Jean-Paul Calderone2015-04-131-1/+5
| | | * Switch the message digest name to bytes.Jean-Paul Calderone2015-04-132-8/+25
| | | * Unify the unspecified argument thing.Jean-Paul Calderone2015-04-133-11/+13
| | | * Merge remote-tracking branch 'origin/master' into 159-crl-export-digestJean-Paul Calderone2015-04-1314-200/+1355
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #209 from exarkun/182-path-typesJean-Paul Calderone2015-04-137-109/+307
|\ \ \ \ | |/ / / |/| | |
| * | | Add some missing type documentation and remove an unused import.Jean-Paul Calderone2015-04-133-6/+14
| * | | Some missing type information in the documentation.Jean-Paul Calderone2015-04-131-3/+8
| * | | ChangeLog entry.Jean-Paul Calderone2015-04-131-0/+6
| * | | Merge remote-tracking branch 'pyca/master' into 182-path-typesJean-Paul Calderone2015-04-1312-89/+1046
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #208 from exarkun/147-no-reasonJean-Paul Calderone2015-04-112-0/+19
|\ \ \ \
| * | | | minor docstring fixesJean-Paul Calderone2015-04-111-4/+6
| * | | | merge alex/aint-no-reason-things-are-this-wayJean-Paul Calderone2015-04-112-0/+17
| |\ \ \ \ |/ / / / /
| * | | | Fixed a typo in the test method nameAlex Gaynor2014-08-151-1/+1
| * | | | A docstring for the testAlex Gaynor2014-08-151-0/+5
| * | | | Fix for py3kAlex Gaynor2014-08-141-1/+1
| * | | | Added a test caseAlex Gaynor2014-08-121-0/+10
| * | | | Handle when an OpenSSL error doesn't contain a reasonAlex Gaynor2014-08-121-0/+2
* | | | | Merge pull request #200 from exarkun/npnJean-Paul Calderone2015-03-234-9/+377
|\ \ \ \ \
| * | | | | ChangeLogJean-Paul Calderone2015-03-231-0/+5
| * | | | | Merge remote-tracking branch 'pyca/master' into npnJean-Paul Calderone2015-03-2212-85/+694
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #199 from exarkun/recv_intoJean-Paul Calderone2015-03-214-0/+211
|\ \ \ \ \ \
| * | | | | | mention flags as wellJean-Paul Calderone2015-03-211-2/+3
| * | | | | | ChangeLogJean-Paul Calderone2015-03-151-0/+6
| * | | | | | Merge remote-tracking branch 'origin/master' into recv_intoJean-Paul Calderone2015-03-1511-85/+483
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #175 from alex/docs-typoJean-Paul Calderone2015-03-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed a typo leading to a syntax error in the docsAlex Gaynor2014-11-261-1/+1
* | | | | | | | Merge pull request #198 from exarkun/remove-rationaleJean-Paul Calderone2015-03-151-61/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge masterremove-rationaleJean-Paul Calderone2015-03-159-22/+479
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |