Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 | ||||
| * | Update test-vectors.rst | michael-hart | 2014-09-24 | 1 | -5/+27 |
| | | | | | | Updated the readme with custom vectors, although formatting errors seem to exist | ||||
| * | Test Vector changes | michael-hart | 2014-09-23 | 12 | -10/+132 |
| | | | | | | | | | | | | | | Changed names of existing vectors to be more instructive about what the key contains, and adapted tests to compensate, which pass. Added public keys for all encryption types and two new private keys for PEM serialization, documented in the README.txt in the same folder | ||||
* | | Merge pull request #1330 from reaperhulk/fix-commoncrypto-gcm | Alex Gaynor | 2014-09-17 | 3 | -1/+54 |
|\ \ | |/ |/| | Fix two bugs with CommonCrypto GCM that can result in invalid output. | ||||
| * | resolve GCM tag issue with AAD only on OpenSSL 1.0.1 in Ubuntu 12.04 | Paul Kehrer | 2014-09-12 | 2 | -4/+12 |
| | | |||||
| * | moved GCM tests to be run against all backends, added radar bug numbers | Paul Kehrer | 2014-09-11 | 3 | -32/+36 |
| | | |||||
| * | byte strings are byte strings | Paul Kehrer | 2014-09-11 | 1 | -9/+9 |
| | | |||||
| * | Fix two bugs with CommonCrypto GCM that can result in invalid output. | Paul Kehrer | 2014-09-11 | 2 | -0/+41 |
| | | | | | | | | | | | | | | Bug #1: Call to AAD but no call to update. Get null tag bytes. Bug #2: Call to update without call to AAD. Get null ciphertext bytes. Fixes #1329 | ||||
* | | Merge pull request #1332 from michael-hart/add_to_authors | Alex Gaynor | 2014-09-12 | 1 | -0/+1 |
|\ \ | | | | | | | Added to AUTHORS.rst | ||||
| * | | Added to AUTHORS.rst | Michael | 2014-09-12 | 1 | -0/+1 |
| |/ | | | | | | | Added Michael Hart to authors | ||||
* | | Merge pull request #1328 from michael-hart/master | Paul Kehrer | 2014-09-12 | 8 | -1/+85 |
|\ \ | |/ |/| | Implemented support for loading EC private keys | ||||
| * | Added PKCS8 encoded private keys to tests | Michael Hart | 2014-09-12 | 3 | -18/+41 |
| | | | | | | | | | | | | | | Generated two files with the same private key as PEM_Serialization's ec_private_key.pem, one unencrypted and one encrypted with "123456". Also changed existing PEMSerialization unit tests to take parameters so that tests can be extended easily. | ||||
| * | Reorganised imports | Michael | 2014-09-12 | 1 | -4/+3 |
| | | | | | | | | | | | | Swapped the order of the imports so that flake8 will see that they are correct, and changed the test import to be relative rather than absolute, as is the standard | ||||
| * | Changed EC curve type and add test markers | Michael | 2014-09-12 | 4 | -9/+17 |
| | | | | | | | | | | | | Changed the Elliptic Curve curve type from secp256k1 to secp256r1, as this is supported, in an attempt to pass tests on CentOS 7; also added markers and methods to skip test functions for systems that do not support ECC. | ||||
| * | Further formatting changes | michael-hart | 2014-09-12 | 1 | -1/+1 |
| | | | | | | Essentially a continuation of the previous commit, this commit tabs a line which should have been tabbed before. | ||||
| * | Corrected formatting | unknown | 2014-09-12 | 1 | -1/+2 |
| | | | | | | | | | | Line was too long in ./cryptography/hazmat/backends/openssl/backend.py, so moved the second part of the statement onto a new line using \ | ||||
| * | Adjusted formatting and added EC check | unknown | 2014-09-12 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | Due to the code failing the PEP-8 test, the test code has been reformatted so that there are two blank lines between the function and the next class, and the overlong line has been adjusted. Also added a check to the private key loading function to check for the Cryptography_HAS_EC field. This has been tested on Windows only. | ||||
| * | Implemented support for loading EC private keys | unknown | 2014-09-11 | 6 | -1/+52 |
|/ | | | | | | Loads Elliptic Curve private keys from .PEM files, whether encrypted or unencrypted, given that the encryption method is supported. Also included changes to the test files and documentation for said method. | ||||
* | Merge pull request #1326 from alex/pem-serialization-backend | Paul Kehrer | 2014-09-09 | 9 | -16/+145 |
|\ | | | | | Start moving everything to the new API | ||||
| * | Grammar from @reaperhulk | Alex Gaynor | 2014-09-09 | 1 | -1/+1 |
| | | |||||
| * | Try a different phrasing | Alex Gaynor | 2014-09-08 | 1 | -4/+5 |
| | | |||||
| * | multibacken for docs | Alex Gaynor | 2014-09-08 | 2 | -3/+30 |
| | | |||||
| * | remove duplicate argument | Alex Gaynor | 2014-09-08 | 1 | -2/+2 |
| | | |||||
| * | Explicitly deprecate these as well | Alex Gaynor | 2014-09-08 | 1 | -2/+18 |
| | | |||||
| * | fixes | Alex Gaynor | 2014-09-08 | 4 | -2/+6 |
| | | |||||
| * | Start moving everything to the new API | Alex Gaynor | 2014-09-08 | 4 | -12/+93 |
|/ | |||||
* | Merge pull request #1276 from alex/pem-loading-backend | Paul Kehrer | 2014-09-08 | 2 | -2/+29 |
|\ | | | | | Added PEMSerializationBackend interface | ||||
| * | typo fix | Alex Gaynor | 2014-09-08 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into pem-loading-backend | Alex Gaynor | 2014-09-08 | 23 | -88/+665 |
| |\ | |/ |/| |