Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #1348 from reaperhulk/improve-naming-consistency | Alex Gaynor | 2014-09-27 | 9 | -9/+191 | |
|\ \ | |/ |/| | deprecate backend method names for elliptic curve number loading | |||||
| * | EC public/private key loader functions try deprecated as fallback | Paul Kehrer | 2014-09-27 | 2 | -2/+29 | |
| | | ||||||
| * | remove duplicate _skip_curve_unsupported | Paul Kehrer | 2014-09-27 | 1 | -9/+1 | |
| | | ||||||
| * | return from deprecated method | Paul Kehrer | 2014-09-27 | 1 | -1/+1 | |
| | | ||||||
| * | fix test coverage on multibackend deprecated methods | Paul Kehrer | 2014-09-27 | 1 | -2/+31 | |
| | | ||||||
| * | multibackend deprecated method needs to call the backend deprecated method | Paul Kehrer | 2014-09-27 | 1 | -2/+20 | |
| | | ||||||
| * | skip deprecated tests on platforms that don't support ec (old rhel) | Paul Kehrer | 2014-09-27 | 1 | -0/+11 | |
| | | ||||||
| * | deprecate backend method names for elliptic curve number loading | Paul Kehrer | 2014-09-27 | 8 | -14/+119 | |
|/ | | | | fixes #1270 | |||||
* | Merge pull request #1346 from reaperhulk/fix-pkcs8-ec-load | Alex Gaynor | 2014-09-26 | 5 | -31/+69 | |
|\ | | | | | Process curve name when loading EC keys. Fixes #1336 | |||||
| * | use NID_undef instead of literal value | Paul Kehrer | 2014-09-26 | 1 | -1/+1 | |
| | | ||||||
| * | fix indentation | Paul Kehrer | 2014-09-26 | 1 | -8/+8 | |
| | | ||||||
| * | add curve name parsing to public key loader | Paul Kehrer | 2014-09-26 | 2 | -15/+21 | |
| | | ||||||
| * | CURVE_TYPES back to private, removed unneeded point creation | Paul Kehrer | 2014-09-26 | 3 | -9/+6 | |
| | | ||||||
| * | learn to pep8 | Paul Kehrer | 2014-09-26 | 1 | -0/+1 | |
| | | ||||||
| * | Process curve name when loading EC keys. Fixes #1336 | Paul Kehrer | 2014-09-26 | 5 | -28/+62 | |
| | | ||||||
* | | Merge pull request #1357 from alex/rename-bn-cntx | Paul Kehrer | 2014-09-26 | 2 | -4/+4 | |
|\ \ | | | | | | | Renamed _bn_ctx_manager(). | |||||
| * | | Renamed _bn_ctx_manager(). | Alex Gaynor | 2014-09-26 | 2 | -4/+4 | |
|/ / | | | | | | | The existing name is confusing because it's ambigious about the fact that ctx belongs to bn or manager. The name doesn't need to say it's a manager anyways, so now it better describes what it does. | |||||
* | | Merge pull request #1356 from alex/docs-cleanup | Paul Kehrer | 2014-09-26 | 1 | -2/+2 | |
|\ \ | | | | | | | Slight clarification of the load_pem_public_key docs | |||||
| * | | Slight clarification of the load_pem_public_key docs | Alex Gaynor | 2014-09-26 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge pull request #1355 from reaperhulk/fix-1352 | Alex Gaynor | 2014-09-26 | 1 | -6/+12 | |
|\ \ | |/ |/| | when setting SSL and SSL_CTX options in tests get current options first | |||||
| * | test_ssl_mode should get current mode as well | Paul Kehrer | 2014-09-26 | 1 | -2/+4 | |
| | | ||||||
| * | In tests for setting SSL and SSL_CTX options, get current options first | Paul Kehrer | 2014-09-26 | 1 | -4/+8 | |
| | | | | | | | | Fixes #1352 | |||||
* | | Merge pull request #1331 from michael-hart/public_key_pem | Paul Kehrer | 2014-09-26 | 10 | -5/+160 | |
|\ \ | |/ |/| | Add support for .PEM public keys, with tests and docs | |||||
| * | Merge branch 'public_key_pem' of ↵ | michael-hart | 2014-09-26 | 0 | -0/+0 | |
| |\ | | | | | | | | | | https://github.com/michael-hart/cryptography into public_key_pem | |||||
| | * | Added missing newline, corrected changes | michael-hart | 2014-09-26 | 2 | -8/+9 | |
| | | | ||||||
| | * | Update multibackend.py | michael-hart | 2014-09-26 | 1 | -0/+2 | |
| | | | | | | | | | Inserted missing newlines | |||||
| | * | Merge branch 'public_key_pem' of ↵ | michael-hart | 2014-09-26 | 0 | -0/+0 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/michael-hart/cryptography into public_key_pem Conflicts: cryptography/hazmat/backends/openssl/backend.py tests/hazmat/primitives/test_serialization.py | |||||
| | | * | Corrected tests | michael-hart | 2014-09-26 | 2 | -19/+10 | |
| | | | | ||||||
| | | * | Added all changes lost in merge reset | michael-hart | 2014-09-26 | 5 | -7/+48 | |
| | | | | ||||||
| | | * | Part 1 of rebase, with corrections for pep8 | michael-hart | 2014-09-25 | 7 | -5/+106 | |
| | | | | ||||||
| | * | | flake8 | michael-hart | 2014-09-26 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | Added code and tests of EC public keys | michael-hart | 2014-09-26 | 2 | -0/+18 | |
| | | | | ||||||
| | * | | Corrected tests | michael-hart | 2014-09-26 | 2 | -19/+10 | |
| | | | | ||||||
| | * | | Added all changes lost in merge reset | michael-hart | 2014-09-26 | 5 | -7/+48 | |
| | | | | ||||||
| | * | | Part 1 of rebase, with corrections for pep8 | michael-hart | 2014-09-26 | 7 | -5/+106 | |
| | | | | ||||||
| * | | | Added missing newline, corrected changes | michael-hart | 2014-09-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update multibackend.py | michael-hart | 2014-09-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | Inserted missing newlines | |||||
| * | | | flake8 | michael-hart | 2014-09-26 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Added code and tests of EC public keys | michael-hart | 2014-09-26 | 2 | -0/+18 | |
| | | | | ||||||
| * | | | Corrected tests | michael-hart | 2014-09-26 | 2 | -19/+10 | |
| | | | | ||||||
| * | | | Added all changes lost in merge reset | michael-hart | 2014-09-26 | 3 | -7/+34 | |
| | | | | ||||||
| * | | | Part 1 of rebase, with corrections for pep8 | michael-hart | 2014-09-26 | 2 | -24/+6 | |
| | | | | ||||||
| * | | | Corrected tests | michael-hart | 2014-09-26 | 2 | -19/+10 | |
| | | | | ||||||
| * | | | Added all changes lost in merge reset | michael-hart | 2014-09-26 | 5 | -7/+48 | |
| | | | | ||||||
| * | | | Part 1 of rebase, with corrections for pep8 | michael-hart | 2014-09-26 | 7 | -5/+106 | |
|/ / / | ||||||
* | | | Merge pull request #1354 from alex/cleanup-travis-install | Paul Kehrer | 2014-09-26 | 1 | -5/+4 | |
|\ \ \ | | | | | | | | | Remove (apparently) unneeded line | |||||
| * | | | Remove (apparently) unneeded line | Alex Gaynor | 2014-09-26 | 1 | -5/+4 | |
|/ / / | ||||||
* | | | Merge pull request #1351 from alex/pypy-2.4 | Paul Kehrer | 2014-09-26 | 1 | -2/+4 | |
|\ \ \ | |/ / |/| | | fixes #1340 -- use pypy 2.4.0 now that it's out | |||||
| * | | bleh update first | Alex Gaynor | 2014-09-26 | 1 | -0/+1 | |
| | | | ||||||
| * | | bump pyenv version | Alex Gaynor | 2014-09-26 | 1 | -0/+1 | |
| | | |