summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Added changelog entry for serialization stuffAlex Gaynor2014-09-271-0/+5
|/ /
* | Merge pull request #1348 from reaperhulk/improve-naming-consistencyAlex Gaynor2014-09-279-9/+191
|\ \ | |/ |/|
| * EC public/private key loader functions try deprecated as fallbackPaul Kehrer2014-09-272-2/+29
| * remove duplicate _skip_curve_unsupportedPaul Kehrer2014-09-271-9/+1
| * return from deprecated methodPaul Kehrer2014-09-271-1/+1
| * fix test coverage on multibackend deprecated methodsPaul Kehrer2014-09-271-2/+31
| * multibackend deprecated method needs to call the backend deprecated methodPaul Kehrer2014-09-271-2/+20
| * skip deprecated tests on platforms that don't support ec (old rhel)Paul Kehrer2014-09-271-0/+11
| * deprecate backend method names for elliptic curve number loadingPaul Kehrer2014-09-278-14/+119
|/
* Merge pull request #1346 from reaperhulk/fix-pkcs8-ec-loadAlex Gaynor2014-09-265-31/+69
|\
| * use NID_undef instead of literal valuePaul Kehrer2014-09-261-1/+1
| * fix indentationPaul Kehrer2014-09-261-8/+8
| * add curve name parsing to public key loaderPaul Kehrer2014-09-262-15/+21
| * CURVE_TYPES back to private, removed unneeded point creationPaul Kehrer2014-09-263-9/+6
| * learn to pep8Paul Kehrer2014-09-261-0/+1
| * Process curve name when loading EC keys. Fixes #1336Paul Kehrer2014-09-265-28/+62
* | Merge pull request #1357 from alex/rename-bn-cntxPaul Kehrer2014-09-262-4/+4
|\ \
| * | Renamed _bn_ctx_manager().Alex Gaynor2014-09-262-4/+4
|/ /
* | Merge pull request #1356 from alex/docs-cleanupPaul Kehrer2014-09-261-2/+2
|\ \
| * | Slight clarification of the load_pem_public_key docsAlex Gaynor2014-09-261-2/+2
| |/
* | Merge pull request #1355 from reaperhulk/fix-1352Alex Gaynor2014-09-261-6/+12
|\ \ | |/ |/|
| * test_ssl_mode should get current mode as wellPaul Kehrer2014-09-261-2/+4
| * In tests for setting SSL and SSL_CTX options, get current options firstPaul Kehrer2014-09-261-4/+8
* | Merge pull request #1331 from michael-hart/public_key_pemPaul Kehrer2014-09-2610-5/+160
|\ \ | |/ |/|
| * Merge branch 'public_key_pem' of https://github.com/michael-hart/cryptography...michael-hart2014-09-260-0/+0
| |\
| | * Added missing newline, corrected changesmichael-hart2014-09-262-8/+9
| | * Update multibackend.pymichael-hart2014-09-261-0/+2
| | * Merge branch 'public_key_pem' of https://github.com/michael-hart/cryptography...michael-hart2014-09-260-0/+0
| | |\
| | | * Corrected testsmichael-hart2014-09-262-19/+10
| | | * Added all changes lost in merge resetmichael-hart2014-09-265-7/+48
| | | * Part 1 of rebase, with corrections for pep8michael-hart2014-09-257-5/+106
| | * | flake8michael-hart2014-09-261-1/+3
| | * | Added code and tests of EC public keysmichael-hart2014-09-262-0/+18
| | * | Corrected testsmichael-hart2014-09-262-19/+10
| | * | Added all changes lost in merge resetmichael-hart2014-09-265-7/+48
| | * | Part 1 of rebase, with corrections for pep8michael-hart2014-09-267-5/+106
| * | | Added missing newline, corrected changesmichael-hart2014-09-261-1/+1
| * | | Update multibackend.pymichael-hart2014-09-261-0/+2
| * | | flake8michael-hart2014-09-261-1/+3
| * | | Added code and tests of EC public keysmichael-hart2014-09-262-0/+18
| * | | Corrected testsmichael-hart2014-09-262-19/+10
| * | | Added all changes lost in merge resetmichael-hart2014-09-263-7/+34
| * | | Part 1 of rebase, with corrections for pep8michael-hart2014-09-262-24/+6
| * | | Corrected testsmichael-hart2014-09-262-19/+10
| * | | Added all changes lost in merge resetmichael-hart2014-09-265-7/+48
| * | | Part 1 of rebase, with corrections for pep8michael-hart2014-09-267-5/+106
|/ / /
* | | Merge pull request #1354 from alex/cleanup-travis-installPaul Kehrer2014-09-261-5/+4
|\ \ \
| * | | Remove (apparently) unneeded lineAlex Gaynor2014-09-261-5/+4
|/ / /
* | | Merge pull request #1351 from alex/pypy-2.4Paul Kehrer2014-09-261-2/+4
|\ \ \ | |/ / |/| |
| * | bleh update firstAlex Gaynor2014-09-261-0/+1
View Lorry Controller Status