Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #399 from reaperhulk/ego-stroking | Alex Gaynor | 2014-01-03 | 1 | -1/+1 |
|\ | | | | | Add to author list | ||||
| * | add to author list | Paul Kehrer | 2014-01-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #397 from alex/long-description | Paul Kehrer | 2014-01-03 | 1 | -2/+11 |
|\ \ | |/ |/| | Include a long description in our setup.py | ||||
| * | Also use an absolute path for the about file | Alex Gaynor | 2014-01-03 | 1 | -3/+5 |
| | | |||||
| * | Include a long description in our setup.py | Alex Gaynor | 2014-01-03 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #391 from alex/spelling-fixes | Paul Kehrer | 2014-01-02 | 2 | -4/+7 |
|\ \ | |/ |/| | Correct spelling, fix phrasing, line wrap. | ||||
| * | Correct spelling, fix phrasing, line wrap. | Alex Gaynor | 2014-01-02 | 2 | -4/+7 |
| | | |||||
* | | Merge pull request #389 from alex/glossary-consistency | David Reid | 2014-01-02 | 1 | -1/+2 |
|\ \ | |/ |/| | Make capitalization in the glossary consistent and sort it | ||||
| * | Merge branch 'master' into glossary-consistency | Alex Gaynor | 2014-01-02 | 3 | -107/+130 |
| |\ | |/ |/| | |||||
* | | Merge pull request #390 from dreid/install-pypy-again | Alex Gaynor | 2014-01-02 | 1 | -1/+17 |
|\ \ | | | | | | | Revert "Travis now has an up to date pypy" | ||||
| * | | Revert "Travis now has an up to date pypy" | David Reid | 2014-01-02 | 1 | -1/+17 |
|/ / | | | | | | | This reverts commit 5a4aa42542c952905fbf83582bff4bb2b328c4e1. | ||||
* | | Merge pull request #388 from alex/privatize-me-captain | Paul Kehrer | 2014-01-02 | 2 | -106/+113 |
|\ \ | | | | | | | Make lib and ffi be private on backend | ||||
| * \ | Merge branch 'master' into privatize-me-captain | Alex Gaynor | 2014-01-01 | 4 | -15/+20 |
| |\ \ | |/ / |/| | | | | | | | | Conflicts: cryptography/hazmat/backends/openssl/backend.py | ||||
| * | | Make lib and ffi be private on backend | Alex Gaynor | 2014-01-01 | 2 | -106/+113 |
| | | | | | | | | | | | | Because now they are public on a binding instance if you need them! | ||||
| | * | Make capitalization in the glossary consistent and sort it | Alex Gaynor | 2014-01-02 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Merge pull request #386 from alex/move-gcm-tag-validation | Paul Kehrer | 2014-01-01 | 4 | -15/+20 |
|\ \ | |/ |/| | Move GCM tag size/value validation farther forward | ||||
| * | Fixed test for earlier exceptino | Alex Gaynor | 2014-01-01 | 1 | -6/+3 |
| | | |||||
| * | Rearrange | Alex Gaynor | 2014-01-01 | 1 | -10/+12 |
| | | |||||
| * | Move GCM tag size/value validation farther forward -- this makes it easier ↵ | Alex Gaynor | 2014-01-01 | 3 | -7/+13 |
| | | | | | | | | by not requiring future backends to implement the same checks | ||||
* | | Merge pull request #380 from public/split-binding | Alex Gaynor | 2014-01-01 | 32 | -144/+255 |
|\ \ | | | | | | | WIP: Split OpenSSL binding from the backend interface | ||||
| * | | Split OpenSSL binding | Alex Stapleton | 2014-01-01 | 32 | -144/+255 |
|/ / | |||||
* | | Merge pull request #387 from exarkun/crypto-locks | Alex Gaynor | 2014-01-01 | 1 | -0/+5 |
|\ \ | |/ |/| | expose num_locks and {get,set}_{id,locking}_callback | ||||
| * | expose num_locks and {get,set}_{id,locking}_callback | Jean-Paul Calderone | 2014-01-01 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #385 from alex/consistent-tox | Paul Kehrer | 2014-01-01 | 1 | -1/+1 |
|\ \ | | | | | | | Make the PyPy tox job consistent with the main one. | ||||
| * | | Make the PyPy tox job consistent with the main one. | Alex Gaynor | 2014-01-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #384 from alex/better-docs | Paul Kehrer | 2014-01-01 | 2 | -15/+3 |
|\ \ | |/ |/| | This page has been subsumed by the index | ||||
| * | THis should be a seperate PR | Alex Gaynor | 2014-01-01 | 1 | -1/+1 |
| | | |||||
| * | Typo fix | Alex Gaynor | 2014-01-01 | 2 | -2/+2 |
| | | |||||
| * | This page has been subsumed by the index | Alex Gaynor | 2014-01-01 | 2 | -15/+3 |
|/ | |||||
* | Merge pull request #383 from alex/bump-copyright | Paul Kehrer | 2014-01-01 | 2 | -2/+2 |
|\ | | | | | Bump the copyright year | ||||
| * | Bump the copyright year | Alex Gaynor | 2014-01-01 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #381 from public/compile-openssl-docs | Paul Kehrer | 2013-12-31 | 1 | -0/+27 |
|\ | | | | | Document compiling OpenSSL to avoid conflicts | ||||
| * | Document compiling OpenSSL to avoid conflicts | Alex Stapleton | 2013-12-31 | 1 | -0/+27 |
|/ | |||||
* | Merge pull request #376 from reaperhulk/more-engine-methods | Alex Gaynor | 2013-12-29 | 1 | -7/+101 |
|\ | | | | | Add the rest of the engine methods | ||||
| * | missed some param names (C style fix) | Paul Kehrer | 2013-12-29 | 1 | -2/+2 |
| | | |||||
| * | add the rest of the engine methods | Paul Kehrer | 2013-12-29 | 1 | -7/+101 |
|/ | |||||
* | Merge pull request #372 from exarkun/tlsv1.1-tlsv1.2 | Alex Gaynor | 2013-12-29 | 1 | -2/+57 |
|\ | | | | | Optionally bind some TLSv1_1 and TLSv1_2 features | ||||
| * | fix bogus merge | Jean-Paul Calderone | 2013-12-29 | 1 | -0/+1 |
| | | |||||
| * | Switch to long for these stand-in constants as suggested by reaperhulk to ↵ | Jean-Paul Calderone | 2013-12-29 | 1 | -2/+2 |
| | | | | | | | | avoid compiler warnings | ||||
| * | merge origin/master | Jean-Paul Calderone | 2013-12-29 | 1 | -0/+12 |
| |\ | |/ |/| | |||||
* | | Merge pull request #373 from alex/restore-symbol | Paul Kehrer | 2013-12-29 | 1 | -0/+13 |
|\ \ | | | | | | | Restore exposing a symbol when it's available. Refs #351 | ||||
| * | | Restore exposing a symbol when it's available. Refs #351 | Alex Gaynor | 2013-12-29 | 1 | -0/+13 |
|/ / | |||||
| * | Optionally bind some TLSv1_1 and TLSv1_2 features | Jean-Paul Calderone | 2013-12-29 | 1 | -2/+57 |
|/ | |||||
* | Merge pull request #369 from public/signed-time_t | Paul Kehrer | 2013-12-28 | 1 | -1/+1 |
|\ | | | | | time_t is signed | ||||
| * | time_t is signed | Alex Stapleton | 2013-12-29 | 1 | -1/+1 |
| | | | | | | | | Unless you are on QNX, lulz. | ||||
* | | Merge pull request #370 from alex/wider-types | Paul Kehrer | 2013-12-28 | 2 | -5/+5 |
|\ \ | | | | | | | Make some types wider to be warning free on OS X | ||||
| * | | Make some types wider to be warning free on OS X | Alex Gaynor | 2013-12-28 | 2 | -5/+5 |
|/ / | |||||
* | | Merge pull request #368 from reaperhulk/more-warnings-fixes | Alex Gaynor | 2013-12-28 | 3 | -4/+4 |
|\ \ | | | | | | | Remove some consts in the function arg declarations | ||||
| * | | remove some consts in the function arg declarations | Paul Kehrer | 2013-12-28 | 3 | -4/+4 |
|/ / | | | | | | | | | | | These functions take const in OpenSSL 1.0.0+ but not in 0.9.8. Removing the const declaration will silence warnings for 0.9.8 but not cause them in 1.0.0+. Not ideal, but *fingers crossed* shouldn't cause problems | ||||
* | | Merge pull request #367 from alex/x509-revoked-stack | Paul Kehrer | 2013-12-28 | 1 | -6/+7 |
|\ \ | | | | | | | Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun figured out for X509 |