aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #360 from reaperhulk/c-style-part-deuxAlex Gaynor2013-12-272-4/+4
|\
| * a few missed functions in the () -> (void) migrationPaul Kehrer2013-12-272-4/+4
* | Merge pull request #357 from public/const-ASN1_ITEM_ptrJean-Paul Calderone2013-12-271-1/+1
|\ \ | |/ |/|
| * ASN1_ITEM_ptr always has a const return typeAlex Stapleton2013-12-271-1/+1
* | Merge pull request #358 from reaperhulk/c-style-changeAlex Gaynor2013-12-2714-66/+65
|\ \
| * | move macro from functions into macros where it belongsPaul Kehrer2013-12-271-2/+1
| * | convert all functions without args from () to (void)Paul Kehrer2013-12-2713-62/+62
| * | update style guide docs to reflect change to (void)Paul Kehrer2013-12-271-3/+3
* | | Merge pull request #353 from reaperhulk/supported-markAlex Gaynor2013-12-2717-408/+342
|\ \ \
| * | | re-add some removed generators to simplify patchPaul Kehrer2013-12-273-50/+101
| * | | change typeerror to valueerrorPaul Kehrer2013-12-272-3/+3
| * | | refactor all tests to use mark instead of generator skipsPaul Kehrer2013-12-2613-450/+290
| * | | rename the method to be less horribly namedPaul Kehrer2013-12-263-10/+10
| * | | add mark that allows us to do skip tests on backends via decoratorsPaul Kehrer2013-12-264-2/+45
| | |/ | |/|
* | | Merge pull request #356 from public/authorsAlex Gaynor2013-12-271-0/+1
|\ \ \ | |_|/ |/| |
| * | Add myself to AUTHORSAlex Stapleton2013-12-271-0/+1
| |/
* | Merge pull request #337 from exarkun/some-typedef-fixesAlex Gaynor2013-12-272-2/+36
|\ \
| * \ Merge remote-tracking branch 'origin/master' into some-typedef-fixesJean-Paul Calderone2013-12-2711-4/+107
| |\ \ | |/ / |/| |
* | | Merge pull request #355 from alex/style-fixesDavid Reid2013-12-272-6/+6
|\ \ \
| * | | A handful of style fixes in the cffi bindingsAlex Gaynor2013-12-272-6/+6
|/ / /
* | | Merge pull request #335 from exarkun/pyopenssl-test_crypto-with-optionalsAlex Gaynor2013-12-276-1/+54
|\ \ \
| * | | remove parameter names, fix some spacingJean-Paul Calderone2013-12-273-15/+15
| * | | Merge remote-tracking branch 'origin/master' into pyopenssl-test_crypto-with-...Jean-Paul Calderone2013-12-2729-52/+263
| |\ \ \ | | | |/ | | |/|
| * | | merge base branch (misc-simple-extras-with-optionals)Jean-Paul Calderone2013-12-232-16/+26
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mine/misc-simple-extras-with-optionals' into py...Jean-Paul Calderone2013-12-231-0/+16
| |\ \ \ \
| * | | | | revert the time_t and BN_ULONG fixesJean-Paul Calderone2013-12-232-16/+2
| * | | | | Define the newly-required CONDITIONAL_NAMESJean-Paul Calderone2013-12-231-0/+2
| * | | | | bind a few more things necessary for OpenSSL.crypto. Also tweak some existin...Jean-Paul Calderone2013-12-237-3/+68
* | | | | | Merge pull request #315 from juliankrause/verifyAlex Gaynor2013-12-275-3/+53
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove verify from Hash.Julian Krause2013-12-264-50/+3
| * | | | | Documentation clarity and grammer fixes.Julian Krause2013-12-262-2/+2
| * | | | | Update documentation on interface as well.Julian Krause2013-12-261-2/+3
| * | | | | Merge branch 'master' of https://github.com/pyca/cryptography into verifyJulian Krause2013-12-2556-281/+755
| |\ \ \ \ \
| * | | | | | Clean up documentation and naming.Julian Krause2013-12-255-14/+22
| * | | | | | Add verify function to hmac and hashes.Julian Krause2013-12-178-6/+90
| | | | | | * expand the explanation for this workaroundJean-Paul Calderone2013-12-272-4/+24
| | | | | | * Use uintptr_t to get sufficiently wide storage for these types even on 32 bit...Jean-Paul Calderone2013-12-272-2/+2
| | | | | | * Shorten long linesJean-Paul Calderone2013-12-272-6/+6
| | | | | | * Merge remote-tracking branch 'origin/master' into some-typedef-fixesJean-Paul Calderone2013-12-2732-47/+301
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #351 from reaperhulk/remove-old-constantAlex Gaynor2013-12-251-1/+0
|\ \ \ \ \ \ \
| * | | | | | | remove SSL_OP_MSIE_SSLV2_RSA_PADDINGPaul Kehrer2013-12-251-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #349 from reaperhulk/compile-warningsAlex Gaynor2013-12-254-22/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix a style errorPaul Kehrer2013-12-251-1/+1
| * | | | | | fix last warning (macro returns ASN1_ITEM_EXP *)Paul Kehrer2013-12-251-1/+1
| * | | | | | 2 more warnings fixed (on both 1.0.1e and 0.9.8y)Paul Kehrer2013-12-251-2/+2
| * | | | | | clean up warnings. 3 left on 1.0.1e, 21 left 0.9.8y (OS X)Paul Kehrer2013-12-253-19/+19
|/ / / / / /
* | | | | | 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