Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | fixes #1340 -- use pypy 2.4.0 now that it's out | Alex Gaynor | 2014-09-25 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1350 from michael-hart/ec_vectors | Alex Gaynor | 2014-09-26 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | Added missing vector file | ||||
| * | | Added missing vector file | michael-hart | 2014-09-26 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1349 from reaperhulk/more-ctx-mger | Alex Gaynor | 2014-09-25 | 1 | -9/+13 |
|\ \ \ | |_|/ |/| | | switch truncate_digest_for_ecdsa to context manager | ||||
| * | | switch truncate_digest_for_ecdsa to context manager | Paul Kehrer | 2014-09-25 | 1 | -9/+13 |
|/ / | | | | | | | Also adds a docstring to fix #1335 | ||||
* | | Merge pull request #1347 from reaperhulk/doc-cleanup | Alex Gaynor | 2014-09-25 | 2 | -22/+15 |
|\ \ | | | | | | | small cleanup to docs | ||||
| * | | small cleanup to docs | Paul Kehrer | 2014-09-24 | 2 | -22/+15 |
| | | | |||||
* | | | Merge pull request #1344 from reaperhulk/bn-ctx-fix | Alex Gaynor | 2014-09-25 | 1 | -15/+24 |
|\ \ \ | |/ / |/| | | start and end BN_CTX so BN_CTX can track func owner of temporary BNs | ||||
| * | | try/finally the bn_ctx manager | Paul Kehrer | 2014-09-24 | 1 | -3/+5 |
| | | | |||||
| * | | switch to a BN_CTX context manager. | Paul Kehrer | 2014-09-24 | 1 | -9/+11 |
| | | | |||||
| * | | extraneous newline murdered | Paul Kehrer | 2014-09-24 | 1 | -1/+0 |
| | | | |||||
| * | | put BN_CTX_end in a finally to ensure it is invoked | Paul Kehrer | 2014-09-24 | 1 | -14/+16 |
| | | | |||||
| * | | start and end BN_CTX so BN_CTX can track func owner of temporary BNs | Paul Kehrer | 2014-09-24 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1341 from michael-hart/ec_vectors | Paul Kehrer | 2014-09-24 | 14 | -15/+166 |
|\ \ \ | |/ / |/| / | |/ | Test Vector changes | ||||
| * | Updated spelling_wordlist.txt | michael-hart | 2014-09-24 | 1 | -0/+1 |
| | | | | | | | | Updated the spelling list to allow for RSA in the vectors README. | ||||
| * | Update spelling_wordlist.txt | michael-hart | 2014-09-24 | 1 | -0/+6 |
| | | | | | | Added some keywords for vector documentation |