aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add initial OCSP bindingsPaul Kehrer2016-01-182-0/+68
|
* Merge pull request #2678 from reaperhulk/windows-hacksAlex Gaynor2016-01-182-9/+8
|\ | | | | consolidate the windows specific header trickery we need to do
| * consolidate the windows specific header trickery we need to doPaul Kehrer2016-01-182-9/+8
|/
* Merge pull request #2676 from alex/docs-pep8-dedupePaul Kehrer2016-01-183-19/+17
|\ | | | | Centralize declaration of docs and pep8 deps in setup.py
| * Centralize declaration of docs and pep8 deps in setup.pyAlex Gaynor2016-01-173-19/+17
| |
* | Merge pull request #2675 from alex/further-reduce-duplicationPaul Kehrer2016-01-182-7/+1
|\ \ | |/ |/| Attempt to further reduce dependecy duplication
| * Delete two out of date commentsAlex Gaynor2016-01-172-2/+0
| |
| * Attempt to further reduce dependecy duplicationAlex Gaynor2016-01-171-5/+1
|/
* Merge pull request #2673 from dveeden/masterAlex Gaynor2016-01-171-0/+6
|\ | | | | Add docstring to cryptography.hazmat
| * Add docstring to cryptography.hazmatDaniƫl van Eeden2016-01-161-0/+6
| | | | | | | | | | | | This shows the warning which is in the docs if someone does this: >>>> import cryptography.hazmat >>>> help(cryptography.hazmat)
* | Merge pull request #2674 from alex/reduce-duplicationPaul Kehrer2016-01-172-7/+5
|\ \ | |/ |/| Attempt to reduce the duplication in declaring our test deps
| * add this back, we couldn't dedupe thereAlex Gaynor2016-01-171-0/+1
| |
| * Give up on toxAlex Gaynor2016-01-171-10/+14
| |
| * more duplication reductionAlex Gaynor2016-01-171-6/+1
| |
| * syntax errorAlex Gaynor2016-01-172-16/+14
|/
* Merge pull request #2671 from alex/sphinx-pinPaul Kehrer2016-01-142-2/+2
|\ | | | | Revert sphinx pin
| * Revert sphinx pinAlex Gaynor2016-01-142-2/+2
|/
* Merge pull request #2668 from alex/hypothesis-paddingPaul Kehrer2016-01-141-0/+21
|\ | | | | Added hypothesis tests for padding
| * resolve the TODO, random block sizesAlex Gaynor2016-01-131-5/+6
| |
| * Added hypothesis tests for paddingAlex Gaynor2016-01-131-0/+20
| |
* | Merge pull request #2663 from reaperhulk/move-moreAlex Gaynor2016-01-123-77/+87
|\ \ | |/ |/| move more functions out of the openssl backend class
| * move more functions out of the openssl backend classPaul Kehrer2016-01-103-77/+87
|/
* Merge pull request #2660 from reaperhulk/move-decode-functionsAlex Gaynor2016-01-103-710/+723
|\ | | | | move openssl asn1 decode functions to a new module
| * move openssl asn1 decode functions to a new modulePaul Kehrer2016-01-103-710/+723
| |
* | Merge pull request #2661 from alex/coveragePaul Kehrer2016-01-103-25/+63
|\ \ | |/ |/| Write some tests for skip conditions in tests.
| * Write some tests for skip conditions in tests.Alex Gaynor2016-01-103-25/+63
| | | | | | | | Without this these branches aren't excersised without 0.9.8, but conceptually they are needed.
* | Merge pull request #2659 from reaperhulk/move-encode-functionsAlex Gaynor2016-01-102-587/+607
|\ \ | | | | | | move openssl asn1 encode functions to a new module
| * | remove duplicated memorybio namedtuplePaul Kehrer2016-01-101-4/+0
| | |
| * | move openssl asn1 encode functions to a new modulePaul Kehrer2016-01-102-587/+611
|/ /
* | Merge pull request #2657 from reaperhulk/port-1.2.1-changelogAlex Gaynor2016-01-081-0/+6
|\ \ | | | | | | port the 1.2.1 changelog to master
| * | port the 1.2.1 changelog to masterPaul Kehrer2016-01-081-0/+6
|/ /
* | Merge pull request #2652 from reaperhulk/changelog-typoAlex Gaynor2016-01-081-1/+1
|\ \ | | | | | | fix a typo in the changelog
| * | fix a typo in the changelogPaul Kehrer2016-01-081-1/+1
| | |
* | | Merge pull request #2651 from reaperhulk/start-thirteenth-releaseAlex Gaynor2016-01-083-2/+7
|\ \ \ | |/ / |/| | open master for development of the thirteenth release
| * | bump values for development of the thirteenth releasePaul Kehrer2016-01-083-2/+7
|/ /
* | Merge pull request #2650 from reaperhulk/1.2-changelogAlex Gaynor2016-01-083-6/+4
|\ \ | |/ |/| bump version and changelog for the twelfth release
| * bump version and changelog for the twelfth releasePaul Kehrer2016-01-073-6/+4
| |
* | Merge pull request #2646 from reaperhulk/static-callbacksAlex Gaynor2016-01-085-15/+96
|\ \ | | | | | | Static callbacks
| * | remove the callbacks we don't use in cryptographyPaul Kehrer2016-01-071-61/+0
| | |
| * | Port callbacks to new static callbackChristian Heimes2016-01-075-16/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cffi 1.4.0 will introduce a new API to create static callbacks. Contrary to the old callback API, static callbacks no longer depend on libffi's dynamic code generation for closures. Static code has some benefits over dynamic generation. For example the code is faster. Also it doesn't need writeable and executable memory mappings, which makes it compatible with SELinux's deny execmem policy. The branch depends on PR #2488. https://bitbucket.org/cffi/cffi/issues/232/static-callbacks Closes: #2477 Signed-off-by: Christian Heimes <cheimes@redhat.com>
| * | Change password callback to use userdata pointerChristian Heimes2016-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of a closure the pem_password_cb now uses the void *userdata argument to exchange data with the callback function. It's a necessary step to port all callbacks to new static callbacks. See: #2477 Signed-off-by: Christian Heimes <christian@python.org>
* | | Merge pull request #2647 from reaperhulk/opaque-evp-pkeyAlex Gaynor2016-01-083-16/+23
|\ \ \ | | | | | | | | opaque EVP_PKEY since EVP_PKEY_id exists
| * | | use EVP_PKEY_id where we canPaul Kehrer2016-01-071-2/+7
| | | |
| * | | add Cryptography_EVP_PKEY_idPaul Kehrer2016-01-072-4/+12
| | | |
| * | | give a real EVP_PKEY with an invalid default key type to the testPaul Kehrer2016-01-071-2/+0
| | | |
| * | | opaque EVP_PKEY since EVP_PKEY_id existsPaul Kehrer2016-01-073-14/+10
| | |/ | |/|
* | | Merge pull request #2649 from reaperhulk/cleanup-namingAlex Gaynor2016-01-082-8/+8
|\ \ \ | |/ / |/| | rename _create_mem_bio to _create_mem_bio_gc for consistency
| * | rename _create_mem_bio to _create_mem_bio_gc for consistencyPaul Kehrer2016-01-072-8/+8
| |/
* | Merge pull request #2648 from reaperhulk/cleanupAlex Gaynor2016-01-081-7/+7
|\ \ | |/ |/| small cleanup to reduce code duplication for EVP_PKEY_new calls
| * small cleanup to reduce code duplication for EVP_PKEY_new callsPaul Kehrer2016-01-071-7/+7
|/