aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #272 from alex/validate-ivDavid Reid2014-01-036-0/+95
|\ | | | | Validate the IV/nonce length for a given algorithm.
| * Merge branch 'master' into validate-ivAlex Gaynor2014-01-0239-278/+410
| |\ | | | | | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py
| * | Explanatory commentAlex Gaynor2014-01-011-1/+3
| | |
| * | Merge branch 'master' into validate-ivAlex Gaynor2014-01-0164-729/+1528
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py
| * | | So the tests don't all explodeAlex Gaynor2013-12-161-0/+4
| | | |
| * | | Merge branch 'master' into validate-ivAlex Gaynor2013-12-1557-139/+899
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py tests/hazmat/primitives/test_block.py
| * \ \ \ Merge branch 'master' into validate-ivAlex Gaynor2013-11-271-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into validate-ivAlex Gaynor2013-11-2718-76/+191
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/hazmat/primitives/test_block.py
| * | | | | | fixed typoAlex Gaynor2013-11-191-1/+1
| | | | | | |
| * | | | | | flake8Alex Gaynor2013-11-191-1/+0
| | | | | | |
| * | | | | | test for ctrAlex Gaynor2013-11-191-0/+8
| | | | | | |
| * | | | | | Tests for OFB and CFBAlex Gaynor2013-11-191-0/+16
| | | | | | |
| * | | | | | Implement this for CTRAlex Gaynor2013-11-191-0/+7
| | | | | | |
| * | | | | | Validate the IV/nonce length for a given algorithm.Alex Gaynor2013-11-196-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #159
* | | | | | | Merge pull request #398 from reaperhulk/backend-skip-backend-nameAlex Gaynor2014-01-032-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Show which backend caused a skip
| * | | | | | | backend support check now lists which backend caused the skipPaul Kehrer2014-01-032-2/+4
| | | | | | | |
* | | | | | | | Merge pull request #399 from reaperhulk/ego-strokingAlex Gaynor2014-01-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add to author list
| * | | | | | | | add to author listPaul Kehrer2014-01-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #397 from alex/long-descriptionPaul Kehrer2014-01-031-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Include a long description in our setup.py
| * | | | | | | Also use an absolute path for the about fileAlex Gaynor2014-01-031-3/+5
| | | | | | | |
| * | | | | | | Include a long description in our setup.pyAlex Gaynor2014-01-031-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #391 from alex/spelling-fixesPaul Kehrer2014-01-022-4/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Correct spelling, fix phrasing, line wrap.
| * | | | | | | Correct spelling, fix phrasing, line wrap.Alex Gaynor2014-01-022-4/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #389 from alex/glossary-consistencyDavid Reid2014-01-021-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Make capitalization in the glossary consistent and sort it
| * | | | | | Merge branch 'master' into glossary-consistencyAlex Gaynor2014-01-023-107/+130
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #390 from dreid/install-pypy-againAlex Gaynor2014-01-021-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "Travis now has an up to date pypy"
| * | | | | | | Revert "Travis now has an up to date pypy"David Reid2014-01-021-1/+17
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a4aa42542c952905fbf83582bff4bb2b328c4e1.
* | | | | | | Merge pull request #388 from alex/privatize-me-captainPaul Kehrer2014-01-022-106/+113
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make lib and ffi be private on backend
| * \ \ \ \ \ \ Merge branch 'master' into privatize-me-captainAlex Gaynor2014-01-014-15/+20
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/backends/openssl/backend.py
| * | | | | | | Make lib and ffi be private on backendAlex Gaynor2014-01-012-106/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because now they are public on a binding instance if you need them!
| | * | | | | | Make capitalization in the glossary consistent and sort itAlex Gaynor2014-01-021-1/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #386 from alex/move-gcm-tag-validationPaul Kehrer2014-01-014-15/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Move GCM tag size/value validation farther forward
| * | | | | | Fixed test for earlier exceptinoAlex Gaynor2014-01-011-6/+3
| | | | | | |
| * | | | | | RearrangeAlex Gaynor2014-01-011-10/+12
| | | | | | |
| * | | | | | Move GCM tag size/value validation farther forward -- this makes it easier ↵Alex Gaynor2014-01-013-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | by not requiring future backends to implement the same checks
* | | | | | | Merge pull request #380 from public/split-bindingAlex Gaynor2014-01-0132-144/+255
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | WIP: Split OpenSSL binding from the backend interface
| * | | | | | | Split OpenSSL bindingAlex Stapleton2014-01-0132-144/+255
|/ / / / / / /
* | | | | | | Merge pull request #387 from exarkun/crypto-locksAlex Gaynor2014-01-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | expose num_locks and {get,set}_{id,locking}_callback
| * | | | | | expose num_locks and {get,set}_{id,locking}_callbackJean-Paul Calderone2014-01-011-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #385 from alex/consistent-toxPaul Kehrer2014-01-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the PyPy tox job consistent with the main one.
| * | | | | | Make the PyPy tox job consistent with the main one.Alex Gaynor2014-01-011-1/+1
| |/ / / / /
* | | | | | Merge pull request #384 from alex/better-docsPaul Kehrer2014-01-012-15/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | This page has been subsumed by the index
| * | | | | THis should be a seperate PRAlex Gaynor2014-01-011-1/+1
| | | | | |
| * | | | | Typo fixAlex Gaynor2014-01-012-2/+2
| | | | | |
| * | | | | This page has been subsumed by the indexAlex Gaynor2014-01-012-15/+3
|/ / / / /
* | | | | Merge pull request #383 from alex/bump-copyrightPaul Kehrer2014-01-012-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Bump the copyright year
| * | | | | Bump the copyright yearAlex Gaynor2014-01-012-2/+2
|/ / / / /
* | | | | Merge pull request #381 from public/compile-openssl-docsPaul Kehrer2013-12-311-0/+27
|\ \ \ \ \ | | | | | | | | | | | | Document compiling OpenSSL to avoid conflicts
| * | | | | Document compiling OpenSSL to avoid conflictsAlex Stapleton2013-12-311-0/+27
|/ / / / /
* | | | | Merge pull request #376 from reaperhulk/more-engine-methodsAlex Gaynor2013-12-291-7/+101
|\ \ \ \ \ | | | | | | | | | | | | Add the rest of the engine methods