aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'upstream/master'Erik Trauschke2015-10-150-0/+0
* Merge pull request #2414 from simo5/fixECtestLoaderPaul Kehrer2015-10-132-3/+3
|\
| * Fix load_kasvs_ecdh_vectors() COUNT sourcingSimo Sorce2015-10-132-3/+3
|/
* Merge pull request #2413 from ddcc/masterPaul Kehrer2015-10-132-2/+32
|\
| * extend pkcs7 openssl bindingsDominic Chen2015-10-132-2/+32
* | Merge pull request #2412 from alex/correct-syntaxPaul Kehrer2015-10-131-6/+6
|\ \
| * | Use the right reST syntax for theseAlex Gaynor2015-10-121-6/+6
| |/
* | Merge pull request #2411 from gutworth/patch-1Alex Gaynor2015-10-131-0/+2
|\ \ | |/ |/|
| * nuke trailing whitespaceBenjamin Peterson2015-10-121-1/+1
| * use :returns: and put annotation in the correct placeBenjamin Peterson2015-10-121-2/+2
| * Indicate the return type of CertificateBuilder.signBenjamin Peterson2015-10-121-0/+2
|/
* Merge pull request #2409 from simo5/InvalidECfixAlex Gaynor2015-10-122-2/+35
|\
| * Catch Invalid X or Y points and raise a ValueErrorSimo Sorce2015-10-122-2/+35
* | Merge pull request #2408 from reaperhulk/docs-docs-docsAlex Gaynor2015-10-122-5/+17
|\ \ | |/ |/|
| * address review commentsPaul Kehrer2015-10-122-3/+7
| * add some links to public key loading in the RSA/DSA verification sectionsPaul Kehrer2015-10-122-5/+13
|/
* Merge pull request #2406 from reaperhulk/update-docs-openssl-builderAlex Gaynor2015-10-111-3/+4
|\
| * update docs to point at newer, fancier openssl builderPaul Kehrer2015-10-111-3/+4
* | Merge pull request #2403 from ddcc/patch-2Donald Stufft2015-10-112-0/+4
|\ \
| * | add shebang for setup.py scriptsDominic Chen2015-10-102-0/+4
| |/
* | Merge pull request #2402 from ddcc/patch-1Paul Kehrer2015-10-116-2/+118
|\ \
| * | add 'hostname' to spellcheck dictionaryDominic Chen2015-10-101-0/+1
| * | fix to handle malformed certificates without hostnameDominic Chen2015-10-105-2/+117
| |/
* | Merge pull request #2405 from alex/unkonwn-public-keyPaul Kehrer2015-10-114-1/+50
|\ \ | |/ |/|
| * typoAlex Gaynor2015-10-111-1/+1
| * handle errorsAlex Gaynor2015-10-101-0/+2
| * Fixed #2404 -- handle a certificate with an unknown public keyAlex Gaynor2015-10-104-1/+48
* | Merge pull request #2401 from reaperhulk/drop-py3-mac-098Donald Stufft2015-10-091-12/+0
|\ \ | |/ |/|
| * remove py3 mac 0.9.8 jobs from travisPaul Kehrer2015-10-081-12/+0
|/
* Merge pull request #1882 from simo5/KEXPaul Kehrer2015-10-073-0/+42
|\
| * Introduce Key Exchange Agreements interfaceSimo Sorce2015-10-073-0/+42
* | Merge pull request #2396 from reaperhulk/unpin-pytestAlex Gaynor2015-10-073-3/+3
|\ \ | |/ |/|
| * unpin pytest now that 2.8.2 is releasedPaul Kehrer2015-10-073-3/+3
|/
* Merge pull request #2395 from Lukasa/static-build-docsPaul Kehrer2015-10-072-0/+56
|\
| * FIPS is a real word!Cory Benfield2015-10-071-0/+1
| * Missing OpenSSL.org link.Cory Benfield2015-10-071-0/+1
| * Don't accidentally use out-of-date OpenSSLs.Cory Benfield2015-10-071-4/+5
| * Move link to bottom of docs page.Cory Benfield2015-10-071-2/+1
| * Document building static wheels on Linux.Cory Benfield2015-10-071-0/+54
|/
* Merge pull request #2393 from Ayrx/add-missing-licensePaul Kehrer2015-10-031-0/+4
|\
| * Add missing license header.Terry Chia2015-10-031-0/+4
* | Merge pull request #2392 from alex/drop-tlsPaul Kehrer2015-10-031-1/+1
|\ \ | |/ |/|
| * drop the tls, it uses a weird CA that's not supported on our CIAlex Gaynor2015-10-021-1/+1
* | Merge pull request #2388 from reaperhulk/docs-testingAlex Gaynor2015-10-022-15/+10
|\ \
| * | add a wordPaul Kehrer2015-10-021-0/+1
| * | simplify installation docs on OS X now that we have cffi wheelsPaul Kehrer2015-10-011-7/+1
| * | update our docs for the testing matrix to be accuratePaul Kehrer2015-10-011-8/+8
* | | Merge pull request #2390 from reaperhulk/x509-docs-fixAlex Gaynor2015-10-021-5/+4
|\ \ \ | |_|/ |/| |
| * | document the extension type requirement a bit betterPaul Kehrer2015-10-021-5/+4
* | | Merge pull request #2391 from reaperhulk/hypothesis-fixesAlex Gaynor2015-10-023-3/+0
|\ \ \ | |/ / |/| |