aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #691 from alex/cite-randomDavid Reid2014-02-251-2/+4
|\
| * Cite Thomas Ptacek for urandomAlex Gaynor2014-02-251-2/+4
|/
* Merge pull request #690 from alex/linewrapDavid Reid2014-02-251-53/+35
|\
| * Re-linewrap the symmetric encryption doc sourceAlex Gaynor2014-02-251-53/+35
|/
* Merge pull request #689 from dreid/twofactor-cleanupAlex Gaynor2014-02-256-35/+36
|\
| * Add TOTP to the changelog.David Reid2014-02-251-0/+1
| * Do some nitpicking cleanup of the twofactor code and documentation.David Reid2014-02-255-35/+35
|/
* Merge pull request #637 from Ayrx/totp-implDavid Reid2014-02-255-33/+268
|\
| * Seperated the totp tests based on different hash typesAyrx2014-02-251-17/+80
| * Fixed wrong param naming in totp documentationAyrx2014-02-251-1/+1
| * Fixed whitespace issue pointed out by flake8Ayrx2014-02-251-1/+1
| * Fixed documentationAyrx2014-02-252-6/+10
| * Added __future__ import statementAyrx2014-02-251-0/+2
| * Updated HOTP and TOTP doctestsAyrx2014-02-251-6/+5
| * Added method definitions to TOTP documentation.Ayrx2014-02-251-1/+13
| * Updated secret key descriptionAyrx2014-02-251-6/+6
| * Fixed documentation based on alexs' comments.Ayrx2014-02-252-13/+22
| * Small fixesAyrx2014-02-252-12/+9
| * Added documentation for TOTP.Ayrx2014-02-252-10/+56
| * Added TOTP implementation and tests.Ayrx2014-02-254-12/+115
* | Merge pull request #688 from reaperhulk/fix-warningAlex Gaynor2014-02-251-1/+1
|\ \
| * | this macro should return a longPaul Kehrer2014-02-251-1/+1
|/ /
* | Merge pull request #686 from fedor-brunner/channel_bindingAlex Gaynor2014-02-251-0/+6
|\ \
| * | Remove commentsFedor Brunner2014-02-251-5/+1
| * | Add OpenSSL bindings for TLS Finished message.Fedor Brunner2014-02-251-0/+10
| |/
* | Merge pull request #678 from koobs/patch-1Alex Gaynor2014-02-251-1/+23
|\ \
| * | And again. Remove whitespace (pep8)koobs2014-02-251-1/+1
| * | pep8: Add import (sys) and newlinekoobs2014-02-251-0/+2
| * | Add new lines (pep8) and use full sentenceskoobs2014-02-251-1/+2
| * | Integrate py.test enabling `python setup.py test`koobs2014-02-251-1/+20
| |/
* | Merge pull request #685 from Ivoz/patch-1Alex Gaynor2014-02-251-0/+1
|\ \ | |/ |/|
| * Add myself to AUTHORS.rstMatt Iversen2014-02-251-0/+1
|/
* Merge pull request #684 from reaperhulk/some-style-fixesAlex Gaynor2014-02-244-6/+9
|\
| * some style fixes suggested by pep8-namingPaul Kehrer2014-02-244-6/+9
|/
* Merge pull request #681 from reaperhulk/add-docs-to-sdistDavid Reid2014-02-241-0/+2
|\
| * don't prune static. why would you do that?Paul Kehrer2014-02-241-1/+0
| * add docs to sdist. fixes #679Paul Kehrer2014-02-241-0/+3
* | Merge pull request #682 from dreid/flake8-select-allPaul Kehrer2014-02-242-2/+3
|\ \ | |/ |/|
| * Fix issues found in hotp with new flake8 configuration.David Reid2014-02-241-2/+2
| * Select all errors, warnings, and flakes.David Reid2014-02-241-0/+1
|/
* Merge pull request #680 from Ivoz/changelogPaul Kehrer2014-02-243-35/+37
|\
| * Add changelog to toplevel, include in sdistMatthew Iversen2014-02-253-35/+37
|/
* Merge pull request #672 from reaperhulk/add-future-import-hotpAlex Gaynor2014-02-231-0/+2
|\
| * add missing future import to hotpPaul Kehrer2014-02-231-0/+2
|/
* Merge pull request #667 from public/pkcs8-test-keysPaul Kehrer2014-02-2319-1/+377
|\
| * Document PKCS #8 key sourcesAlex Stapleton2014-02-221-1/+10
| * Unencrypted PKCS8 ECC private keys from BotanAlex Stapleton2014-02-225-0/+40
| * Private keys from GnuTLS tests/pkcs12_s2k_pem.cAlex Stapleton2014-02-2210-0/+170
| * Encrypted RSA private key from GnuTLS testsAlex Stapleton2014-02-221-0/+40
| * Unencrypted RSA private key from GnuTLS testsAlex Stapleton2014-02-221-0/+79