aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/pyca/cryptography into verifyJulian Krause2013-12-2556-281/+755
|\
| * Merge pull request #347 from alex/better-error-emssagePaul Kehrer2013-12-245-59/+35
| |\
| | * Move stuff around and coverageAlex Gaynor2013-12-245-61/+35
| | * Update testAlex Gaynor2013-12-241-1/+1
| | * Include teh name of the backend in the error messageAlex Gaynor2013-12-241-3/+5
| * | Merge pull request #346 from reaperhulk/mark-tests-2Alex Gaynor2013-12-2411-0/+52
| |\ \ | | |/ | |/|
| | * correct import stylePaul Kehrer2013-12-247-0/+7
| | * Merge branch 'master' into mark-tests-2Paul Kehrer2013-12-240-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #345 from reaperhulk/mark-testsAlex Gaynor2013-12-244-0/+73
| |\ \
| | | * add all the markers to the testsPaul Kehrer2013-12-2411-0/+45
| | |/
| | * whoops, python 2.6 compatible format stringPaul Kehrer2013-12-241-1/+1
| | * add test marks for various backend functionalityPaul Kehrer2013-12-244-0/+73
| |/
| * Merge pull request #343 from alex/fix-coveragePaul Kehrer2013-12-241-2/+1
| |\
| | * Cover a missed branchAlex Gaynor2013-12-241-2/+1
| * | Merge pull request #342 from alex/reorganize-backend-docsPaul Kehrer2013-12-242-14/+14
| |\ \ | | |/ | |/|
| | * Slightly reorganize and cleanuip the backend docsAlex Gaynor2013-12-242-14/+14
| |/
| * Merge pull request #341 from alex/backwards-compatPaul Kehrer2013-12-243-1/+52
| |\
| | * RephraseAlex Gaynor2013-12-241-2/+3
| | * TypoAlex Gaynor2013-12-241-1/+1
| | * Note abotu development versionsAlex Gaynor2013-12-241-0/+2
| | * Forgotten fileAlex Gaynor2013-12-241-0/+48
| | * Document our API stability policy. Fixes #312Alex Gaynor2013-12-242-1/+1
| |/
| * Merge pull request #340 from reaperhulk/skip-checks-all-aroundAlex Gaynor2013-12-232-0/+40
| |\
| | * add more skip check lambdasPaul Kehrer2013-12-232-0/+40
| |/
| * Merge pull request #339 from dreid/pytest-sPaul Kehrer2013-12-231-2/+2
| |\
| | * Run py.test with catpure=no for more faster.David Reid2013-12-231-2/+2
| * | Merge pull request #338 from reaperhulk/hmac-supported-checkAlex Gaynor2013-12-235-8/+29
| |\ \ | | |/ | |/|
| | * fix erroneous indent and add abstractmethod to HMACBackendPaul Kehrer2013-12-232-2/+9
| | * add hmac_supported method to backend.Paul Kehrer2013-12-234-10/+24
| |/
| * Merge pull request #334 from exarkun/misc-simple-extras-with-optionalsAlex Gaynor2013-12-234-1/+44
| |\
| | * Merge remote-tracking branch 'origin/master' into misc-simple-extras-with-opt...Jean-Paul Calderone2013-12-232-16/+26
| | |\ | | |/ | |/|
| * | Merge pull request #336 from alex/consistent-backendDavid Reid2013-12-232-15/+12
| |\ \
| | * | FixAlex Gaynor2013-12-231-3/+3
| | * | Make the naming of things in the OpenSSL backend more consistentAlex Gaynor2013-12-232-12/+9
| |/ /
| * | Merge pull request #333 from alex/conditional-names-opensslDavid Reid2013-12-2323-1/+90
| |\ \
| | * | A docstringAlex Gaynor2013-12-231-0/+14
| | * | This name is alreayd known to be importedAlex Gaynor2013-12-231-1/+0
| | | * Also make SSL_OP_NO_COMPRESSION optionalJean-Paul Calderone2013-12-231-0/+16
| | | * Finish that conditional supportJean-Paul Calderone2013-12-231-0/+6
| | | * Try making SSL_MODE_RELEASE_BUFFERS conditional on whether the underlying Ope...Jean-Paul Calderone2013-12-231-2/+13
| | | * bind a few more assorted random simple thingsJean-Paul Calderone2013-12-234-0/+10
| | |/
| | * Invert these dics for more readabilityAlex Gaynor2013-12-233-13/+18
| | * Reduce duplicationAlex Gaynor2013-12-231-2/+3
| | * Remove names from the backend that don't actually existAlex Gaynor2013-12-2323-0/+70
| |/
| * Merge pull request #154 from cyli/ssl_bindingsAlex Gaynor2013-12-222-2/+52
| |\
| | * Remove SSL_CTX_clear_options, since it doesn't seem to be in openssl 0.9.8cyli2013-12-221-1/+0
| | * Remove some extra parameters in function declarationscyli2013-12-221-5/+5
| | * Change the Cryptography-specific variable namescyli2013-12-221-6/+6
| | * Oops, change to Cryptography_, not CRYPTOPGRAPHY_ (screaming). Also remove S...cyli2013-12-201-7/+6
| | * Rename PYOPENSSL_ to CRYPTOGRAPHY_cyli2013-12-201-6/+6