aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
|/
* Merge pull request #2645 from reaperhulk/pypy-use-the-coverageAlex Gaynor2016-01-071-0/+1
|\ | | | | properly merge pypy coverage with coveragerc paths
| * properly merge pypy coverage with coveragerc pathsPaul Kehrer2016-01-071-0/+1
|/
* Merge pull request #2641 from reaperhulk/fix-2640Alex Gaynor2016-01-062-17/+27
|\ | | | | refactor the init validation of AuthorityKeyIdentifier
| * refactor the init validation of AuthorityKeyIdentifierPaul Kehrer2016-01-052-17/+27
|/ | | | Fixes #2640
* Merge pull request #2638 from reaperhulk/travis-pypyAlex Gaynor2016-01-044-18/+16
|\ | | | | Travis PyPy coverage
| * modify upload_coverage to handle pypy-nocoverage properlyPaul Kehrer2016-01-041-5/+10
| |
| * install me a pypy plzPaul Kehrer2016-01-031-1/+1
| |
| * install the right pypy for pypy-nocov as wellPaul Kehrer2016-01-031-1/+1
| |
| * add missing basepythonPaul Kehrer2016-01-031-0/+1
| |
| * add a pypy-nocoverage target and use that on OS XPaul Kehrer2016-01-033-2/+10
| |
| * Drop pypy3, we don't run it in CI, and we won't run it again until these ↵Alex Gaynor2016-01-032-9/+1
| | | | | | | | issues are resolved
| * Attempt to enable coverage on pypyAlex Gaynor2016-01-032-9/+1
| |
* | Merge pull request #2639 from reaperhulk/readme-renameAlex Gaynor2016-01-041-1/+1
|\ \ | |/ |/| Remove or rename readme
| * readme has been renamed to readme_rendererPaul Kehrer2016-01-041-1/+1
|/
* Merge pull request #2625 from reaperhulk/full-coverageAlex Gaynor2016-01-033-0/+10
|\ | | | | full branch coverage by custom compiling 1.0.0
| * add a py27 for 1.0.0 as wellPaul Kehrer2016-01-031-0/+2
| |
| * run a 1.0.0 test in travis as wellPaul Kehrer2016-01-033-0/+8
| |
* | Merge pull request #2635 from alex/rfc-hashPaul Kehrer2016-01-032-0/+11
|\ \ | |/ |/| Implement __hash__ on RFC822Name
| * Implement __hash__ on RFC822NameAlex Gaynor2016-01-032-0/+11
| |
* | Merge pull request #2636 from alex/uri-hashPaul Kehrer2016-01-032-0/+11
|\ \ | | | | | | Implement __hash__ on UniformResourceIdentifier
| * | Implement __hash__ on UniformResourceIdentifierAlex Gaynor2016-01-032-0/+11
| |/
* | Merge pull request #2633 from reaperhulk/travis-sed-thingAlex Gaynor2016-01-031-0/+5
|\ \ | |/ |/| sed the openssl makefile to change the shlib version
| * more review commentsPaul Kehrer2016-01-031-3/+4
| |
| * match a bit more robustlyPaul Kehrer2016-01-031-3/+3
| |
| * sed the openssl makefile to change the shlib versionPaul Kehrer2016-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this to prevent a version collision between the custom one we're installing and whatever the system has. OpenSSL 1.0.0 through 1.0.2 all declare an SHLIB version of 1.0.0, so if Python has been linked against 1.0.1 and cryptography against 1.0.0, but then you try to load Python it will consider either 1.0.1 or 1.0.0 to satisfy the library version. This is, of course, nonsense since 1.0.1 has substantially more symbols than 1.0.0. The result is that if you do a LD_LIBRARY_PATH that points at the "real" 1.0.0 then Python will fail to load because there are missing symbols. We can avoid this entire nonsense by changing the major version. The dynamic linker will happily load both versions and nothing will kerplode.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 14:46:07 +0000