aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #2367 from pyca/update-security-osxPaul Kehrer2015-09-251-3/+4
|\ \
| * | 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
|\
| * 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 cleanupsAlex Gaynor2015-09-245-26/+28
|/
* Merge pull request #2343 from simo5/ANS_X963Paul Kehrer2015-09-247-0/+488
|\
| * Test X9.63 with NIST test vectorsSimo Sorce2015-09-241-0/+72
| * Add vector loader for X9.63 vectorsSimo Sorce2015-09-242-0/+130
| * Add X963KDF from ANSI X9.63:2001Simo Sorce2015-09-244-0/+286
|/
* Merge pull request #2363 from etrauschke/asn_utilsPaul Kehrer2015-09-242-73/+63
|\
| * 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
|\
| * 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
|\
| * 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 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+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 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 KDFSimo Sorce2015-09-182-0/+1336
|/
* 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 installPaul Kehrer2015-09-182-6/+6
|/
* Merge pull request #2351 from alex/trovePaul Kehrer2015-09-181-0/+1
|\
| * 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 documentationMatěj Grabovský2015-09-161-1/+1
|/
* Merge pull request #2337 from reaperhulk/py35-and-pypyAlex Gaynor2015-09-153-1/+23
|\
| * 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 windowsPaul Kehrer2015-09-151-1/+1
|/ /
| * 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
|\
| * 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
|\
| * 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 redirectionAlex Gaynor2015-09-091-1/+1
|/ /
| * Don't use pipesAlex Gaynor2015-09-091-1/+2
|/
* Merge pull request #2294 from bjmc/add_name_to_oidsPaul Kehrer2015-09-082-1/+11
|\
| * Merge branch 'master' into add_name_to_oidsBrendan McCollam2015-09-0715-83/+216
| |\ | |/ |/|