aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* simplify installation docs on OS X now that we have cffi wheelsPaul Kehrer2015-10-011-7/+1
|
* update our docs for the testing matrix to be accuratePaul Kehrer2015-10-011-8/+8
|
* Merge pull request #2380 from reaperhulk/port-102-changelogAlex Gaynor2015-09-271-0/+11
|\ | | | | port 1.0.2 changelog to master
| * port 1.0.2 changelog to masterPaul Kehrer2015-09-261-0/+11
|/
* Merge pull request #2377 from alex/internal-errorPaul Kehrer2015-09-267-63/+23
|\ | | | | Use InternalError for stuff
| * unused importAlex Gaynor2015-09-261-3/+1
| |
| * Use InternalError for stuffAlex Gaynor2015-09-267-60/+22
|/
* Merge pull request #2375 from alex/assert-in-bindingPaul Kehrer2015-09-263-38/+50
|\ | | | | Convert asserts in bindings as well
| * fix the testsAlex Gaynor2015-09-262-5/+6
| |
| * flake8 itAlex Gaynor2015-09-261-6/+4
| |
| * Convert asserts in bindings as wellAlex Gaynor2015-09-262-36/+49
|/
* Merge pull request #2374 from alex/renamePaul Kehrer2015-09-261-0/+0
|\ | | | | rename this file for consistency
| * rename this file for consistencyAlex Gaynor2015-09-261-0/+0
| |
* | Merge pull request #2372 from alex/a-few-more-assertsPaul Kehrer2015-09-263-3/+3
|\ \ | |/ |/| converted a few more asserts
| * converted a few more assertsAlex Gaynor2015-09-263-3/+3
|/
* Merge pull request #2370 from reaperhulk/asserts-begone-2Alex Gaynor2015-09-268-87/+90
|\ | | | | convert the rest of the openssl backend to using openssl_assert
| * move two asserts much closer to call sitePaul Kehrer2015-09-251-2/+2
| |
| * convert the rest of the openssl backend to using openssl_assertPaul Kehrer2015-09-258-87/+90
|/
* Merge pull request #2369 from alex/we-testPaul Kehrer2015-09-251-2/+2
|\ | | | | We test on 3.5
| * Merge branch 'master' into we-testAlex Gaynor2015-09-252-154/+178
| |\ | |/ |/|
* | Merge pull request #2368 from reaperhulk/asserts-begoneAlex Gaynor2015-09-252-154/+178
|\ \ | | | | | | start converting asserts to a function call
| * | add test for openssl_assertPaul Kehrer2015-09-251-1/+6
| | |
| * | remove unnecessary checkPaul Kehrer2015-09-251-1/+0
| | |
| * | change some asserts back since they're not openssl specificPaul Kehrer2015-09-251-18/+19
| | | | | | | | | | | | plus bonus better exception msg
| * | start converting asserts to a function callPaul Kehrer2015-09-251-166/+185
|/ / | | | | | | | | This prevents situations where asserts are bypassed when running python with -O.
| * We test on 3.5Alex Gaynor2015-09-251-2/+2
|/
* Merge pull request #2366 from reaperhulk/new-travisAlex Gaynor2015-09-251-0/+8
|\ | | | | add some el capitan to our travis build matrix
| * Merge branch 'master' into new-travisPaul Kehrer2015-09-251-3/+4
| |\ | |/ |/|
* | Merge pull request #2367 from pyca/update-security-osxPaul Kehrer2015-09-251-3/+4
|\ \ | | | | | | We ship statically linked wheels for OS X as well
| * | We ship statically linked wheels for OS X as wellAlex Gaynor2015-09-251-3/+4
|/ /
| * move them above docs jobPaul Kehrer2015-09-241-4/+4
| |
| * add some el capitan to our travis build matrixPaul Kehrer2015-09-241-0/+8
|/
* Merge pull request #2365 from alex/grammarDonald Stufft2015-09-243-3/+3
|\ | | | | some commas that look correct
| * appeasementAlex Gaynor2015-09-241-1/+1
| |
| * some commas that look correctAlex Gaynor2015-09-244-4/+4
|/
* Merge pull request #2364 from alex/cleanupsPaul Kehrer2015-09-245-26/+28
|\ | | | | Some cleanups
| * Some cleanupsAlex Gaynor2015-09-245-26/+28
|/
* Merge pull request #2343 from simo5/ANS_X963Paul Kehrer2015-09-247-0/+488
|\ | | | | Implement ANSI X9.63 KDF
| * Test X9.63 with NIST test vectorsSimo Sorce2015-09-241-0/+72
| | | | | | | | Signed-off-by: Simo Sorce <simo@redhat.com>
| * Add vector loader for X9.63 vectorsSimo Sorce2015-09-242-0/+130
| | | | | | | | Signed-off-by: Simo Sorce <simo@redhat.com>
| * Add X963KDF from ANSI X9.63:2001Simo Sorce2015-09-244-0/+286
|/ | | | | | | | | | The implemention allows the use a Hash function to implement a KDF very similar to ConcatKDFHash, just different enough to require a separate derivation function. Closes #2203 Signed-off-by: Simo Sorce <simo@redhat.com>
* Merge pull request #2363 from etrauschke/asn_utilsPaul Kehrer2015-09-242-73/+63
|\ | | | | should have _asn1_* utility functions in a common place
| * should have _asn1_* utility functions in a common placeErik Trauschke2015-09-242-73/+63
|/
* Merge pull request #2360 from obi1kenobi/masterPaul Kehrer2015-09-231-4/+2
|\ | | | | SubjectKeyIdentifier equality now uses constant-time digest comparison.
| * Made import order alphabetical.Predrag Gruevski2015-09-231-1/+1
| |
| * SubjectKeyIdentifier equality now uses constant-time digest comparison.Predrag Gruevski2015-09-231-4/+2
|/
* Merge pull request #2361 from reaperhulk/release-docsAlex Gaynor2015-09-221-5/+20
|\ | | | | add docs on how to upgrade OpenSSL on OS X and windows builders
| * Merge branch 'master' into release-docsPaul Kehrer2015-09-221-2/+9
| |\ | |/ |/|
* | Merge pull request #2362 from alex/cover-all-the-backendsPaul Kehrer2015-09-221-2/+9
|\ \ | | | | | | fix up test coverage on multibackend
| * | fix up test coverage on multibackendAlex Gaynor2015-09-221-2/+9
|/ /