aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Error cleanly if the public and private keys to an ECDH key exchange are on ↵Alex Gaynor2015-10-282-1/+32
| | | | different curves
* Merge pull request #2454 from reaperhulk/reopen-masterAlex Gaynor2015-10-283-2/+7
|\ | | | | reopen master for development on the twelfth release
| * reopen master for development on the twelfth releasePaul Kehrer2015-10-293-2/+7
|/
* Merge pull request #2453 from reaperhulk/1.1-releaseAlex Gaynor2015-10-283-7/+10
|\ | | | | bump version and update changelog for eleventh release (1.1)
| * bump version and update changelog for eleventh release (1.1)Paul Kehrer2015-10-293-7/+10
|/ | | | Add some missing changelog entries
* Merge pull request #2450 from reaperhulk/numbers-reprAlex Gaynor2015-10-272-0/+11
|\ | | | | add ellipticcurvepublicnumbers repr
| * add ellipticcurvepublicnumbers reprPaul Kehrer2015-10-282-0/+11
|/
* Merge pull request #2447 from reaperhulk/encode-decode-pointAlex Gaynor2015-10-275-2/+135
|\ | | | | add support for encoding/decoding elliptic curve points
| * address review feedbackPaul Kehrer2015-10-282-12/+2
| |
| * add changelog entryPaul Kehrer2015-10-281-0/+6
| |
| * modify approach to use EllipticCurvePublicNumbers methodsPaul Kehrer2015-10-276-152/+136
| |
| * remove support for null points, improve docsPaul Kehrer2015-10-273-12/+13
| |
| * rst continues to be a mysteryPaul Kehrer2015-10-271-2/+1
| |
| * fix some docsPaul Kehrer2015-10-271-6/+12
| |
| * add support for encoding/decoding elliptic curve pointsPaul Kehrer2015-10-264-4/+151
| | | | | | | | Based on the work of @ronf in #2346.
* | Merge pull request #2449 from reaperhulk/document-constructorsAlex Gaynor2015-10-271-25/+39
|\ \ | | | | | | document the constructors for our extensions and general names
| * | inline some type declarations in the docsPaul Kehrer2015-10-281-18/+7
| | |
| * | document the constructors for our extensions and general namesPaul Kehrer2015-10-281-25/+50
| |/ | | | | | | | | | | Most of these extensions have the same attributes as constructor args, so for those I only added the args to the class name to avoid large scale duplication.
* | Merge pull request #2435 from reaperhulk/fix-2407Alex Gaynor2015-10-275-6/+52
|\ \ | | | | | | encode countryName with PrintableString
| * | update comment to include a bit more detailPaul Kehrer2015-10-271-2/+2
| | |
| * | work on py3Paul Kehrer2015-10-271-2/+2
| | |
| * | remove unneeded strPaul Kehrer2015-10-271-2/+2
| | |
| * | switch to using pyasn1_modules for the testPaul Kehrer2015-10-274-15/+17
| | |
| * | encode countryName with PrintableStringPaul Kehrer2015-10-205-6/+50
| | | | | | | | | | | | | | | | | | | | | This commit adds a dependency on asn1crypto for testing purposes to parse the certificate and confirm that countryName is encoded with PrintableString while other fields are UTF8String. This is a test only dep.
* | | Merge pull request #2446 from reaperhulk/init-locksAlex Gaynor2015-10-262-2/+8
|\ \ \ | |_|/ |/| | move lock initialization to during binding import
| * | modify sadness prosePaul Kehrer2015-10-271-3/+5
| | |
| * | expand commentPaul Kehrer2015-10-241-1/+3
| | |
| * | move lock initialization to during binding importPaul Kehrer2015-10-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Previously we attempted to register our openssl locks only if the backend was initialized, but we should really just do it immediately. Consumers like PyOpenSSL already call init_static_locks after importing the binding and if a library wants to replace the locks with something else they can do so themselves.
* | | Merge pull request #2220 from reaperhulk/encode-cpAlex Gaynor2015-10-242-0/+179
|\ \ \ | |/ / |/| | support encoding certificate policies in CertificateBuilder
| * | use new ExtensionOIDPaul Kehrer2015-10-241-1/+1
| | |
| * | one more assertPaul Kehrer2015-10-241-1/+1
| | |
| * | convert asserts to openssl_assertPaul Kehrer2015-10-241-10/+10
| | |
| * | support encoding certificate policies in CertificateBuilderPaul Kehrer2015-10-242-0/+179
| | |
* | | Merge pull request #2293 from reaperhulk/idempotent-engine-addAlex Gaynor2015-10-243-8/+11
|\ \ \ | |/ / |/| | idempotent engine add
| * | address review commentsPaul Kehrer2015-10-241-5/+2
| | |
| * | make engine addition idempotentPaul Kehrer2015-10-213-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Threading issues keep cropping up. ENGINE_add already acquires a lock at the C layer via CRYPTO_w_lock (provided you have registered the locking callbacks) so let's try to use that. As part of this we'll try to init the openssl locks, but of course there's potentially a race there as well. Clearly this isn't the real fix but it might improve the situation while we try to determine what to do.
* | | Merge pull request #2445 from alex/name-hashPaul Kehrer2015-10-243-0/+26
|\ \ \ | | | | | | | | Fixed #2444 -- added an __hash__ to x509 Names
| * | | typoAlex Gaynor2015-10-241-1/+1
| | | |
| * | | changelog entryAlex Gaynor2015-10-241-0/+1
| | | |
| * | | Fixed #2444 -- added an __hash__ to x509 NamesAlex Gaynor2015-10-242-0/+25
|/ / /
* | | Merge pull request #2441 from reaperhulk/better-linking-docsAlex Gaynor2015-10-231-1/+4
|\ \ \ | | | | | | | | some ec key exchange doc improvements
| * | | some ec key exchange doc improvementsPaul Kehrer2015-10-221-1/+4
|/ / /
* | | Merge pull request #1970 from reaperhulk/aes-keywrap-pythonlvh2015-10-225-0/+264
|\ \ \ | |/ / |/| | AES keywrap support
| * | add comments on test cases to explain reasons a bit betterPaul Kehrer2015-10-221-0/+5
| | |
| * | update a commentPaul Kehrer2015-10-221-2/+3
| | |
| * | add info about the rfcPaul Kehrer2015-10-221-0/+6
| | |
| * | expand keywrap intro docsPaul Kehrer2015-10-211-1/+4
| | |
| * | make skip message more verbosePaul Kehrer2015-10-211-11/+10
| | |
| * | add version added info and doc exceptionPaul Kehrer2015-10-211-0/+7
| | |
| * | pep8!Paul Kehrer2015-10-211-1/+1
| | |