Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | simplify installation docs on OS X now that we have cffi wheels | Paul Kehrer | 2015-10-01 | 1 | -7/+1 |
| | |||||
* | update our docs for the testing matrix to be accurate | Paul Kehrer | 2015-10-01 | 1 | -8/+8 |
| | |||||
* | Merge pull request #2380 from reaperhulk/port-102-changelog | Alex Gaynor | 2015-09-27 | 1 | -0/+11 |
|\ | | | | | port 1.0.2 changelog to master | ||||
| * | port 1.0.2 changelog to master | Paul Kehrer | 2015-09-26 | 1 | -0/+11 |
|/ | |||||
* | Merge pull request #2377 from alex/internal-error | Paul Kehrer | 2015-09-26 | 7 | -63/+23 |
|\ | | | | | Use InternalError for stuff | ||||
| * | unused import | Alex Gaynor | 2015-09-26 | 1 | -3/+1 |
| | | |||||
| * | Use InternalError for stuff | Alex Gaynor | 2015-09-26 | 7 | -60/+22 |
|/ | |||||
* | Merge pull request #2375 from alex/assert-in-binding | Paul Kehrer | 2015-09-26 | 3 | -38/+50 |
|\ | | | | | Convert asserts in bindings as well | ||||
| * | fix the tests | Alex Gaynor | 2015-09-26 | 2 | -5/+6 |
| | | |||||
| * | flake8 it | Alex Gaynor | 2015-09-26 | 1 | -6/+4 |
| | | |||||
| * | Convert asserts in bindings as well | Alex Gaynor | 2015-09-26 | 2 | -36/+49 |
|/ | |||||
* | Merge pull request #2374 from alex/rename | Paul Kehrer | 2015-09-26 | 1 | -0/+0 |
|\ | | | | | rename this file for consistency | ||||
| * | rename this file for consistency | Alex Gaynor | 2015-09-26 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #2372 from alex/a-few-more-asserts | Paul Kehrer | 2015-09-26 | 3 | -3/+3 |
|\ \ | |/ |/| | converted a few more asserts | ||||
| * | converted a few more asserts | Alex Gaynor | 2015-09-26 | 3 | -3/+3 |
|/ | |||||
* | 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 |
|/ / |