aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
| * add docs on how to upgrade OpenSSL on OS X and windows buildersPaul Kehrer2015-09-221-5/+20
|/
* Merge pull request #2356 from alex/doc-pypyPaul Kehrer2015-09-192-2/+2
|\ | | | | Fixes #2353 -- document that we need PyPy 2.6+
| * Fixes #2353 -- document that we need PyPy 2.6+Alex Gaynor2015-09-192-2/+2
|/
* Merge pull request #2355 from alex/pin-pytestPaul Kehrer2015-09-193-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 warningsAlex Gaynor2015-09-193-3/+3
|/
* Merge pull request #2344 from simo5/X963_vectorsPaul Kehrer2015-09-182-0/+1336
|\ | | | | Add NIST Vectors for ANSI X9.63 KDF
| * Add NIST Vectors for ANSI X9.63 KDFSimo Sorce2015-09-182-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-latestAlex Gaynor2015-09-182-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 installPaul Kehrer2015-09-182-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/trovePaul Kehrer2015-09-181-0/+1
|\ | | | | added a trove classifier
| * added a trove classifierAlex Gaynor2015-09-171-0/+1
|/
* Merge pull request #2349 from mgrabovsky/doc-fixPaul Kehrer2015-09-161-1/+1
|\ | | | | Correct order of parameters in documentation
| * Correct order of parameters in documentationMatěj Grabovský2015-09-161-1/+1
|/
* Merge pull request #2337 from reaperhulk/py35-and-pypyAlex Gaynor2015-09-153-1/+23
|\ | | | | Python 3.5 support
| * Merge branch 'master' into py35-and-pypyPaul Kehrer2015-09-151-1/+1
| |\ | |/ |/|
* | Merge pull request #2345 from reaperhulk/pytest-workaroundAlex Gaynor2015-09-151-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 windowsPaul Kehrer2015-09-151-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 matrixPaul Kehrer2015-09-153-1/+23
|/
* Merge pull request #2332 from reaperhulk/upgrade-osx-buildersAlex Gaynor2015-09-102-16/+14
|\ | | | | upgrade os x travis jobs to use latest image
| * install/upgrade pyenv in os x buildersPaul Kehrer2015-09-101-4/+2
| |
| * upgrade os x travis jobs to use latest imagePaul Kehrer2015-09-101-12/+12
|/
* Merge pull request #2334 from pyca/alex-patch-2Paul Kehrer2015-09-101-1/+2
|\ | | | | Don't use pipes
| * Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-091-1/+1
| |\ | |/ |/|
* | Merge pull request #2333 from pyca/alex-patch-1Paul Kehrer2015-09-091-1/+1
|\ \ | | | | | | Don't use shell redirection
| * | Don't use shell redirectionAlex Gaynor2015-09-091-1/+1
|/ /
| * Don't use pipesAlex Gaynor2015-09-091-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_oidsPaul Kehrer2015-09-082-1/+11
|\ | | | | Adds name property to ObjectIdentifier
| * Merge branch 'master' into add_name_to_oidsBrendan McCollam2015-09-0715-83/+216
| |\ | |/ |/|
* | Merge pull request #2329 from reaperhulk/changelog-101Alex Gaynor2015-09-051-0/+12
|\ \ | | | | | | port 1.0.1 changelog to master
| * | port 1.0.1 changelog to masterPaul Kehrer2015-09-051-0/+12
|/ /
* | Merge pull request #2326 from reaperhulk/osx-static-linking-docsDonald Stufft2015-09-051-14/+41
|\ \ | | | | | | rework OS X install docs to describe static/dynamic linking
| * | rework OS X install docs to describe static/dynamic linkingPaul Kehrer2015-09-051-14/+41
|/ /
* | Merge pull request #2306 from reaperhulk/static-linking-osxDonald Stufft2015-09-053-9/+35
|\ \ | | | | | | Support static linking on OS X
| * \ Merge branch 'master' into static-linking-osxPaul Kehrer2015-09-051-22/+24
| |\ \ | |/ / |/| |
* | | Merge pull request #2322 from reaperhulk/docs-fixAlex Gaynor2015-09-041-22/+24
|\ \ \ | | | | | | | | fix a docs typo and convert it to a doctest to prevent future problems
| * \ \ Merge branch 'master' into docs-fixPaul Kehrer2015-09-044-45/+47
| |\ \ \ | |/ / / |/| | |
| * | | fix a docs typo and convert it to a doctest to prevent future problemsPaul Kehrer2015-09-041-22/+24
| | | |
| | * | Merge branch 'master' into static-linking-osxPaul Kehrer2015-09-048-52/+95
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #2320 from etrauschke/crl_vector_fixesPaul Kehrer2015-09-031-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.0Erik Trauschke2015-09-031-34/+33
|/ / / /
* | | | Merge pull request #2319 from alex/x509-tutorial-docs-bugPaul Kehrer2015-09-031-6/+9
|\ \ \ \ | | | | | | | | | | Fixed #2318 -- added the missing critical flag to the x509 tutorial