aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 line
| * Remove (apparently) unneeded lineAlex Gaynor2014-09-261-5/+4
|/
* Merge pull request #1351 from alex/pypy-2.4Paul Kehrer2014-09-261-2/+4
|\ | | | | fixes #1340 -- use pypy 2.4.0 now that it's out
| * bleh update firstAlex Gaynor2014-09-261-0/+1
| |
| * bump pyenv versionAlex Gaynor2014-09-261-0/+1
| |
| * fixes #1340 -- use pypy 2.4.0 now that it's outAlex Gaynor2014-09-251-2/+2
| |
* | Merge pull request #1350 from michael-hart/ec_vectorsAlex Gaynor2014-09-261-0/+4
|\ \ | |/ |/| Added missing vector file
| * Added missing vector filemichael-hart2014-09-261-0/+4
| |
* | Merge pull request #1349 from reaperhulk/more-ctx-mgerAlex Gaynor2014-09-251-9/+13
|\ \ | | | | | | switch truncate_digest_for_ecdsa to context manager
| * | switch truncate_digest_for_ecdsa to context managerPaul Kehrer2014-09-251-9/+13
|/ / | | | | | | Also adds a docstring to fix #1335
* | Merge pull request #1347 from reaperhulk/doc-cleanupAlex Gaynor2014-09-252-22/+15
|\ \ | | | | | | small cleanup to docs
| * | small cleanup to docsPaul Kehrer2014-09-242-22/+15
| | |
* | | Merge pull request #1344 from reaperhulk/bn-ctx-fixAlex Gaynor2014-09-251-15/+24
|\ \ \ | |/ / |/| | start and end BN_CTX so BN_CTX can track func owner of temporary BNs
| * | try/finally the bn_ctx managerPaul Kehrer2014-09-241-3/+5
| | |
| * | switch to a BN_CTX context manager.Paul Kehrer2014-09-241-9/+11
| | |
| * | extraneous newline murderedPaul Kehrer2014-09-241-1/+0
| | |
| * | put BN_CTX_end in a finally to ensure it is invokedPaul Kehrer2014-09-241-14/+16
| | |
| * | start and end BN_CTX so BN_CTX can track func owner of temporary BNsPaul Kehrer2014-09-241-0/+4
| | |
* | | Merge pull request #1341 from michael-hart/ec_vectorsPaul Kehrer2014-09-2414-15/+166
|\ \ \ | |/ / |/| / | |/ Test Vector changes
| * Updated spelling_wordlist.txtmichael-hart2014-09-241-0/+1
| | | | | | | | Updated the spelling list to allow for RSA in the vectors README.
| * Update spelling_wordlist.txtmichael-hart2014-09-241-0/+6
| | | | | | Added some keywords for vector documentation
| * Update test-vectors.rstmichael-hart2014-09-241-5/+27
| | | | | | Updated the readme with custom vectors, although formatting errors seem to exist
| * Test Vector changesmichael-hart2014-09-2312-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-gcmAlex Gaynor2014-09-173-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.04Paul Kehrer2014-09-122-4/+12
| |
| * moved GCM tests to be run against all backends, added radar bug numbersPaul Kehrer2014-09-113-32/+36
| |
| * byte strings are byte stringsPaul Kehrer2014-09-111-9/+9
| |
| * Fix two bugs with CommonCrypto GCM that can result in invalid output.Paul Kehrer2014-09-112-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_authorsAlex Gaynor2014-09-121-0/+1
|\ \ | | | | | | Added to AUTHORS.rst
| * | Added to AUTHORS.rstMichael2014-09-121-0/+1
| |/ | | | | | | Added Michael Hart to authors
* | Merge pull request #1328 from michael-hart/masterPaul Kehrer2014-09-128-1/+85
|\ \ | |/ |/| Implemented support for loading EC private keys
| * Added PKCS8 encoded private keys to testsMichael Hart2014-09-123-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 importsMichael2014-09-121-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 markersMichael2014-09-124-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 changesmichael-hart2014-09-121-1/+1
| | | | | | Essentially a continuation of the previous commit, this commit tabs a line which should have been tabbed before.
| * Corrected formattingunknown2014-09-121-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 checkunknown2014-09-122-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 keysunknown2014-09-116-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-backendPaul Kehrer2014-09-099-16/+145
|\ | | | | Start moving everything to the new API
| * Grammar from @reaperhulkAlex Gaynor2014-09-091-1/+1
| |
| * Try a different phrasingAlex Gaynor2014-09-081-4/+5
| |
| * multibacken for docsAlex Gaynor2014-09-082-3/+30
| |
| * remove duplicate argumentAlex Gaynor2014-09-081-2/+2
| |
| * Explicitly deprecate these as wellAlex Gaynor2014-09-081-2/+18
| |
| * fixesAlex Gaynor2014-09-084-2/+6
| |
| * Start moving everything to the new APIAlex Gaynor2014-09-084-12/+93
|/