summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2751 from reaperhulk/1.2.3-changelog1.2.31.2.xAlex Gaynor2016-03-013-2/+7
|\
| * bump to 1.2.3Paul Kehrer2016-03-013-2/+7
* | Merge pull request #2753 from reaperhulk/backport-tox-setup-changesAlex Gaynor2016-03-015-33/+30
|\ \ | |/ |/|
| * move BIO_new_mem_buf to macros to handle 1.0.2g signature changePaul Kehrer2016-03-011-1/+2
| * Merge pull request #2726 from alex/hypothesis-2.6Paul Kehrer2016-03-012-1/+7
| * Merge pull request #2676 from alex/docs-pep8-dedupePaul Kehrer2016-03-013-19/+17
| * Merge pull request #2675 from alex/further-reduce-duplicationPaul Kehrer2016-03-012-7/+1
| * Merge pull request #2674 from alex/reduce-duplicationPaul Kehrer2016-03-012-7/+5
|/
* Merge pull request #2697 from reaperhulk/1.2.2-changelog1.2.2Alex Gaynor2016-01-293-2/+7
|\
| * update changelog and version for 1.2.2Paul Kehrer2016-01-293-2/+7
|/
* Merge pull request #2655 from reaperhulk/1.2.1-changelog1.2.1Alex Gaynor2016-01-083-2/+8
|\
| * changelog and version bump for 1.2.1Paul Kehrer2016-01-083-2/+8
* | Merge pull request #2654 from reaperhulk/unopaque-evp-pkeyAlex Gaynor2016-01-081-1/+4
|\ \ | |/ |/|
| * revert opaquing of evp_pkey struct to prevent pyopenssl breakagePaul Kehrer2016-01-081-1/+4
|/
* Merge pull request #2650 from reaperhulk/1.2-changelog1.2Alex Gaynor2016-01-083-6/+4
|\
| * 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
|\ \
| * | 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
| * | Change password callback to use userdata pointerChristian Heimes2016-01-071-0/+1
* | | Merge pull request #2647 from reaperhulk/opaque-evp-pkeyAlex Gaynor2016-01-083-16/+23
|\ \ \
| * | | 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 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 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 pathsPaul Kehrer2016-01-071-0/+1
|/
* Merge pull request #2641 from reaperhulk/fix-2640Alex Gaynor2016-01-062-17/+27
|\
| * refactor the init validation of AuthorityKeyIdentifierPaul Kehrer2016-01-052-17/+27
|/
* Merge pull request #2638 from reaperhulk/travis-pypyAlex Gaynor2016-01-044-18/+16
|\
| * 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 issu...Alex Gaynor2016-01-032-9/+1
| * Attempt to enable coverage on pypyAlex Gaynor2016-01-032-9/+1
* | Merge pull request #2639 from reaperhulk/readme-renameAlex Gaynor2016-01-041-1/+1
|\ \ | |/ |/|
| * 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
|\
| * 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 RFC822NameAlex Gaynor2016-01-032-0/+11
* | Merge pull request #2636 from alex/uri-hashPaul Kehrer2016-01-032-0/+11
|\ \
| * | Implement __hash__ on UniformResourceIdentifierAlex Gaynor2016-01-032-0/+11
| |/