Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into urandom-engine | Paul Kehrer | 2014-01-02 | 4 | -108/+132 |
|\ | | | | | | | | | | | | | * master: Revert "Travis now has an up to date pypy" Make capitalization in the glossary consistent and sort it Make lib and ffi be private on backend | ||||
| * | 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 branch 'master' into urandom-engine | Paul Kehrer | 2014-01-01 | 40 | -177/+312 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split OpenSSL binding Fixed test for earlier exceptino Rearrange Move GCM tag size/value validation farther forward -- this makes it easier by not requiring future backends to implement the same checks expose num_locks and {get,set}_{id,locking}_callback Make the PyPy tox job consistent with the main one. THis should be a seperate PR Typo fix This page has been subsumed by the index Bump the copyright year Document compiling OpenSSL to avoid conflicts Conflicts: cryptography/hazmat/backends/openssl/backend.py | ||||
| * | | 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 |
| |/ | |||||
* | | remove stray break, add FD_CLOEXEC, reset fd var even if close fails | Paul Kehrer | 2014-01-01 | 1 | -1/+4 |
| | | |||||
* | | rename urandom engine to osrandom engine | Paul Kehrer | 2013-12-31 | 3 | -58/+58 |
| | | |||||
* | | remove inaccurate comment | Paul Kehrer | 2013-12-31 | 1 | -2/+0 |
| | | |||||
* | | check if the fd is available via engine status | Paul Kehrer | 2013-12-31 | 1 | -2/+10 |
| | | |||||
* | | improve init/finish engine funcs, do a better job inc/dec struct/func refs | Paul Kehrer | 2013-12-31 | 3 | -26/+22 |
| | | |||||
* | | Add dummy engine to tests and test other engine scenarios | Paul Kehrer | 2013-12-31 | 2 | -20/+172 |
| | | | | | | | | Modify register_urandom_engine to fix a leak | ||||
* | | additional check to verify the ENGINE_new doesn't return null | Paul Kehrer | 2013-12-30 | 1 | -0/+3 |
| | | |||||
* | | remove unneeded INT_MAX check | Paul Kehrer | 2013-12-30 | 1 | -1/+1 |
| | | |||||
* | | fix fd int check, remove stray comedy printf() | Paul Kehrer | 2013-12-30 | 1 | -3/+2 |
| | | |||||
* | | add urandom engine register/unregister tests | Paul Kehrer | 2013-12-30 | 3 | -20/+81 |
| | | | | | | | | also rename some variables in the urandom engine for easier comparison | ||||
* | | allow the backend to register/unregister the engine via methods | Paul Kehrer | 2013-12-30 | 2 | -5/+34 |
| | | |||||
* | | add urandom engine and set it as default RAND method. | Paul Kehrer | 2013-12-30 | 2 | -0/+165 |
|/ | | | | This is a proposed solution to the OpenSSL fork problem. | ||||
* | 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 |
|/ |