aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fernetAlex Gaynor2014-01-0241-275/+434
|\ | | | | | | | | Conflicts: docs/index.rst
| * 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
| * | 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
| | | * 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!
| * | 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
| |/
* | Remove this one weird debuggerAlex Gaynor2013-12-311-3/+0
| |
* | Rearange sentence on recommendation of @jacobianAlex Gaynor2013-12-312-3/+6
| |
* | alphabetizeAlex Gaynor2013-12-301-1/+1
| |
* | Merge branch 'master' into fernetAlex Gaynor2013-12-3037-569/+800
|\|
| * Merge pull request #376 from reaperhulk/more-engine-methodsAlex Gaynor2013-12-291-7/+101
| |\ | | | | | | Add the rest of the engine methods
| | * missed some param names (C style fix)Paul Kehrer2013-12-291-2/+2
| | |
| | * add the rest of the engine methodsPaul Kehrer2013-12-291-7/+101
| |/
| * Merge pull request #372 from exarkun/tlsv1.1-tlsv1.2Alex Gaynor2013-12-291-2/+57
| |\ | | | | | | Optionally bind some TLSv1_1 and TLSv1_2 features
| | * fix bogus mergeJean-Paul Calderone2013-12-291-0/+1
| | |
| | * Switch to long for these stand-in constants as suggested by reaperhulk to ↵Jean-Paul Calderone2013-12-291-2/+2
| | | | | | | | | | | | avoid compiler warnings
| | * merge origin/masterJean-Paul Calderone2013-12-291-0/+12
| | |\ | | |/ | |/|
| * | Merge pull request #373 from alex/restore-symbolPaul Kehrer2013-12-291-0/+13
| |\ \ | | | | | | | | Restore exposing a symbol when it's available. Refs #351
| | * | Restore exposing a symbol when it's available. Refs #351Alex Gaynor2013-12-291-0/+13
| |/ /
| | * Optionally bind some TLSv1_1 and TLSv1_2 featuresJean-Paul Calderone2013-12-291-2/+57
| |/
| * Merge pull request #369 from public/signed-time_tPaul Kehrer2013-12-281-1/+1
| |\ | | | | | | time_t is signed
| | * time_t is signedAlex Stapleton2013-12-291-1/+1
| | | | | | | | | | | | Unless you are on QNX, lulz.
| * | Merge pull request #370 from alex/wider-typesPaul Kehrer2013-12-282-5/+5
| |\ \ | | | | | | | | Make some types wider to be warning free on OS X
| | * | Make some types wider to be warning free on OS XAlex Gaynor2013-12-282-5/+5
| |/ /
| * | Merge pull request #368 from reaperhulk/more-warnings-fixesAlex Gaynor2013-12-283-4/+4
| |\ \ | | | | | | | | Remove some consts in the function arg declarations
| | * | remove some consts in the function arg declarationsPaul Kehrer2013-12-283-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-stackPaul Kehrer2013-12-281-6/+7
| |\ \ | | | | | | | | Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun figured out for X509
| | * | Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun ↵Alex Gaynor2013-12-281-6/+7
| |/ / | | | | | | | | | figured out for X509
| * | Merge pull request #364 from exarkun/certificates-and-stuffAlex Gaynor2013-12-284-12/+35
| |\ \ | | | | | | | | expose SSL_get_peer_cert_chain, SSL_get_client_CA_list, and SSL_CTX_set_client_CA_list
| | * | clean up the comments a bitJean-Paul Calderone2013-12-283-8/+10
| | | |
| | * | Switch other spellings of this type from `struct stack_st_X509` to ↵Jean-Paul Calderone2013-12-283-12/+12
| | | | | | | | | | | | | | | | `Cryptography_STACK_OF_X590` (and similar for X509_NAME)
| | * | move these type definitions to perhaps-more-appropriate modulesJean-Paul Calderone2013-12-283-9/+6
| | | |