Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #2345 from reaperhulk/pytest-workaround | Alex Gaynor | 2015-09-15 | 1 | -1/+1 | |
|\ \ | | | | | | | workaround for pytest 2.7.3's expectation of USERNAME on windows | |||||
| * | | workaround for pytest 2.7.3's expectation of USERNAME on windows | Paul Kehrer | 2015-09-15 | 1 | -1/+1 | |
|/ / | | | | | | | | | We should remove this when a pytest that resolves https://github.com/pytest-dev/pytest/issues/1010 is released | |||||
| * | let's add python 3.5 to our test matrix | Paul Kehrer | 2015-09-15 | 3 | -1/+23 | |
|/ | ||||||
* | Merge pull request #2332 from reaperhulk/upgrade-osx-builders | Alex Gaynor | 2015-09-10 | 2 | -16/+14 | |
|\ | | | | | upgrade os x travis jobs to use latest image | |||||
| * | install/upgrade pyenv in os x builders | Paul Kehrer | 2015-09-10 | 1 | -4/+2 | |
| | | ||||||
| * | upgrade os x travis jobs to use latest image | Paul Kehrer | 2015-09-10 | 1 | -12/+12 | |
|/ | ||||||
* | Merge pull request #2334 from pyca/alex-patch-2 | Paul Kehrer | 2015-09-10 | 1 | -1/+2 | |
|\ | | | | | Don't use pipes | |||||
| * | Merge branch 'master' into alex-patch-2 | Alex Gaynor | 2015-09-09 | 1 | -1/+1 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #2333 from pyca/alex-patch-1 | Paul Kehrer | 2015-09-09 | 1 | -1/+1 | |
|\ \ | | | | | | | Don't use shell redirection | |||||
| * | | Don't use shell redirection | Alex Gaynor | 2015-09-09 | 1 | -1/+1 | |
|/ / | ||||||
| * | Don't use pipes | Alex Gaynor | 2015-09-09 | 1 | -1/+2 | |
|/ | | | Download the whole file first, @glyph points out that truncation attacks are a thing. | |||||
* | Merge pull request #2294 from bjmc/add_name_to_oids | Paul Kehrer | 2015-09-08 | 2 | -1/+11 | |
|\ | | | | | Adds name property to ObjectIdentifier | |||||
| * | Merge branch 'master' into add_name_to_oids | Brendan McCollam | 2015-09-07 | 15 | -83/+216 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #2329 from reaperhulk/changelog-101 | Alex Gaynor | 2015-09-05 | 1 | -0/+12 | |
|\ \ | | | | | | | port 1.0.1 changelog to master | |||||
| * | | port 1.0.1 changelog to master | Paul Kehrer | 2015-09-05 | 1 | -0/+12 | |
|/ / | ||||||
* | | Merge pull request #2326 from reaperhulk/osx-static-linking-docs | Donald Stufft | 2015-09-05 | 1 | -14/+41 | |
|\ \ | | | | | | | rework OS X install docs to describe static/dynamic linking | |||||
| * | | rework OS X install docs to describe static/dynamic linking | Paul Kehrer | 2015-09-05 | 1 | -14/+41 | |
|/ / | ||||||
* | | Merge pull request #2306 from reaperhulk/static-linking-osx | Donald Stufft | 2015-09-05 | 3 | -9/+35 | |
|\ \ | | | | | | | Support static linking on OS X | |||||
| * \ | Merge branch 'master' into static-linking-osx | Paul Kehrer | 2015-09-05 | 1 | -22/+24 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #2322 from reaperhulk/docs-fix | Alex Gaynor | 2015-09-04 | 1 | -22/+24 | |
|\ \ \ | | | | | | | | | fix a docs typo and convert it to a doctest to prevent future problems | |||||
| * \ \ | Merge branch 'master' into docs-fix | Paul Kehrer | 2015-09-04 | 4 | -45/+47 | |
| |\ \ \ | |/ / / |/| | | | ||||||
| * | | | fix a docs typo and convert it to a doctest to prevent future problems | Paul Kehrer | 2015-09-04 | 1 | -22/+24 | |
| | | | | ||||||
| | * | | Merge branch 'master' into static-linking-osx | Paul Kehrer | 2015-09-04 | 8 | -52/+95 | |
| | |\ \ | |_|/ / |/| | | | ||||||
* | | | | Merge pull request #2320 from etrauschke/crl_vector_fixes | Paul Kehrer | 2015-09-03 | 1 | -34/+33 | |
|\ \ \ \ | | | | | | | | | | | remove critical flag from cert issuer entry ext to work with OpenSSL … | |||||
| * | | | | remove critical flag from cert issuer entry ext to work with OpenSSL < 1.0.0 | Erik Trauschke | 2015-09-03 | 1 | -34/+33 | |
|/ / / / | ||||||
* | | | | Merge pull request #2319 from alex/x509-tutorial-docs-bug | Paul Kehrer | 2015-09-03 | 1 | -6/+9 | |
|\ \ \ \ | | | | | | | | | | | Fixed #2318 -- added the missing critical flag to the x509 tutorial | |||||
| * | | | | Fixed #2318 -- added the missing critical flag to the x509 tutorial | Alex Gaynor | 2015-09-03 | 1 | -6/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #2316 from pyca/pypy-2.6.1 | Paul Kehrer | 2015-09-01 | 2 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | upgrade to pypy 2.6.1 | |||||
| * | | | fix | Alex Gaynor | 2015-09-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | upgrade to pypy 2.6.1 | Alex Gaynor | 2015-09-01 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #2304 from Ayrx/fernet-docs-kdf | Paul Kehrer | 2015-08-30 | 2 | -0/+42 | |
|\ \ \ | | | | | | | | | Add some text regarding using passwords with Fernet. | |||||
| * | | | Add bcrypt to word list. | Terry Chia | 2015-08-30 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Mention bcrypt and scrypt. | Terry Chia | 2015-08-30 | 1 | -1/+2 | |
| | | | |