Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2370 from reaperhulk/asserts-begone-2 | Alex Gaynor | 2015-09-26 | 8 | -87/+90 |
|\ | | | | | convert the rest of the openssl backend to using openssl_assert | ||||
| * | move two asserts much closer to call site | Paul Kehrer | 2015-09-25 | 1 | -2/+2 |
| | | |||||
| * | convert the rest of the openssl backend to using openssl_assert | Paul Kehrer | 2015-09-25 | 8 | -87/+90 |
|/ | |||||
* | Merge pull request #2369 from alex/we-test | Paul Kehrer | 2015-09-25 | 1 | -2/+2 |
|\ | | | | | We test on 3.5 | ||||
| * | Merge branch 'master' into we-test | Alex Gaynor | 2015-09-25 | 2 | -154/+178 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2368 from reaperhulk/asserts-begone | Alex Gaynor | 2015-09-25 | 2 | -154/+178 |
|\ \ | | | | | | | start converting asserts to a function call | ||||
| * | | add test for openssl_assert | Paul Kehrer | 2015-09-25 | 1 | -1/+6 |
| | | | |||||
| * | | remove unnecessary check | Paul Kehrer | 2015-09-25 | 1 | -1/+0 |
| | | | |||||
| * | | change some asserts back since they're not openssl specific | Paul Kehrer | 2015-09-25 | 1 | -18/+19 |
| | | | | | | | | | | | | plus bonus better exception msg | ||||
| * | | start converting asserts to a function call | Paul Kehrer | 2015-09-25 | 1 | -166/+185 |
|/ / | | | | | | | | | This prevents situations where asserts are bypassed when running python with -O. | ||||
| * | We test on 3.5 | Alex Gaynor | 2015-09-25 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #2366 from reaperhulk/new-travis | Alex Gaynor | 2015-09-25 | 1 | -0/+8 |
|\ | | | | | add some el capitan to our travis build matrix | ||||
| * | Merge branch 'master' into new-travis | Paul Kehrer | 2015-09-25 | 1 | -3/+4 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2367 from pyca/update-security-osx | Paul Kehrer | 2015-09-25 | 1 | -3/+4 |
|\ \ | | | | | | | We ship statically linked wheels for OS X as well | ||||
| * | | We ship statically linked wheels for OS X as well | Alex Gaynor | 2015-09-25 | 1 | -3/+4 |
|/ / | |||||
| * | move them above docs job | Paul Kehrer | 2015-09-24 | 1 | -4/+4 |
| | | |||||
| * | add some el capitan to our travis build matrix | Paul Kehrer | 2015-09-24 | 1 | -0/+8 |
|/ | |||||
* | Merge pull request #2365 from alex/grammar | Donald Stufft | 2015-09-24 | 3 | -3/+3 |
|\ | | | | | some commas that look correct | ||||
| * | appeasement | Alex Gaynor | 2015-09-24 | 1 | -1/+1 |
| | | |||||
| * | some commas that look correct | Alex Gaynor | 2015-09-24 | 4 | -4/+4 |
|/ | |||||
* | Merge pull request #2364 from alex/cleanups | Paul Kehrer | 2015-09-24 | 5 | -26/+28 |
|\ | | | | | Some cleanups | ||||
| * | Some cleanups | Alex Gaynor | 2015-09-24 | 5 | -26/+28 |
|/ | |||||
* | Merge pull request #2343 from simo5/ANS_X963 | Paul Kehrer | 2015-09-24 | 7 | -0/+488 |
|\ | | | | | Implement ANSI X9.63 KDF | ||||
| * | Test X9.63 with NIST test vectors | Simo Sorce | 2015-09-24 | 1 | -0/+72 |
| | | | | | | | | Signed-off-by: Simo Sorce <simo@redhat.com> | ||||
| * | Add vector loader for X9.63 vectors | Simo Sorce | 2015-09-24 | 2 | -0/+130 |
| | | | | | | | | Signed-off-by: Simo Sorce <simo@redhat.com> | ||||
| * | Add X963KDF from ANSI X9.63:2001 | Simo Sorce | 2015-09-24 | 4 | -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_utils | Paul Kehrer | 2015-09-24 | 2 | -73/+63 |
|\ | | | | | should have _asn1_* utility functions in a common place | ||||
| * | should have _asn1_* utility functions in a common place | Erik Trauschke | 2015-09-24 | 2 | -73/+63 |
|/ | |||||
* | Merge pull request #2360 from obi1kenobi/master | Paul Kehrer | 2015-09-23 | 1 | -4/+2 |
|\ | | | | | SubjectKeyIdentifier equality now uses constant-time digest comparison. | ||||
| * | Made import order alphabetical. | Predrag Gruevski | 2015-09-23 | 1 | -1/+1 |
| | | |||||
| * | SubjectKeyIdentifier equality now uses constant-time digest comparison. | Predrag Gruevski | 2015-09-23 | 1 | -4/+2 |
|/ | |||||
* | Merge pull request #2361 from reaperhulk/release-docs | Alex Gaynor | 2015-09-22 | 1 | -5/+20 |
|\ | | | | | add docs on how to upgrade OpenSSL on OS X and windows builders | ||||
| * | Merge branch 'master' into release-docs | Paul Kehrer | 2015-09-22 | 1 | -2/+9 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2362 from alex/cover-all-the-backends | Paul Kehrer | 2015-09-22 | 1 | -2/+9 |
|\ \ | | | | | | | fix up test coverage on multibackend | ||||
| * | | fix up test coverage on multibackend | Alex Gaynor | 2015-09-22 | 1 | -2/+9 |
|/ / | |||||
| * | add docs on how to upgrade OpenSSL on OS X and windows builders | Paul Kehrer | 2015-09-22 | 1 | -5/+20 |
|/ | |||||
* | Merge pull request #2356 from alex/doc-pypy | Paul Kehrer | 2015-09-19 | 2 | -2/+2 |
|\ | | | | | Fixes #2353 -- document that we need PyPy 2.6+ | ||||
| * | Fixes #2353 -- document that we need PyPy 2.6+ | Alex Gaynor | 2015-09-19 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #2355 from alex/pin-pytest | Paul Kehrer | 2015-09-19 | 3 | -3/+3 |
|\ | | | | | Pin pytest to <2.8, there's a bug with deprecation warnings | ||||
| * | Pin pytest to <2.8, there's a bug with deprecation warnings | Alex Gaynor | 2015-09-19 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #2344 from simo5/X963_vectors | Paul Kehrer | 2015-09-18 | 2 | -0/+1336 |
|\ | | | | | Add NIST Vectors for ANSI X9.63 KDF | ||||
| * | Add NIST Vectors for ANSI X9.63 KDF | Simo Sorce | 2015-09-18 | 2 | -0/+1336 |
|/ | | | | | | | Source: http://csrc.nist.gov/groups/STM/cavp/documents/components/800-135testvectors/ansx963_2001.zip Signed-off-by: Simo Sorce <simo@redhat.com> | ||||
* | Merge pull request #2352 from reaperhulk/pypy-latest | Alex Gaynor | 2015-09-18 | 2 | -6/+6 |
|\ | | | | | pypy 2.6.1 has a bug where it can segfault during vector install | ||||
| * | pypy 2.6.1 has a bug where it can segfault during vector install | Paul Kehrer | 2015-09-18 | 2 | -6/+6 |
|/ | | | | | This PR changes our tests to run against the latest nightly for now. We should change it back when pypy 2.7 is out. | ||||
* | Merge pull request #2351 from alex/trove | Paul Kehrer | 2015-09-18 | 1 | -0/+1 |
|\ | | | | | added a trove classifier | ||||
| * | added a trove classifier | Alex Gaynor | 2015-09-17 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #2349 from mgrabovsky/doc-fix | Paul Kehrer | 2015-09-16 | 1 | -1/+1 |
|\ | | | | | Correct order of parameters in documentation | ||||
| * | Correct order of parameters in documentation | Matěj Grabovský | 2015-09-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2337 from reaperhulk/py35-and-pypy | Alex Gaynor | 2015-09-15 | 3 | -1/+23 |
|\ | | | | | Python 3.5 support | ||||
| * | Merge branch 'master' into py35-and-pypy | Paul Kehrer | 2015-09-15 | 1 | -1/+1 |
| |\ | |/ |/| |