summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #245 from jpadilla/fix-key-errorsfix-ec-ssh-pub-keyMark Adams2017-03-147-40/+68
|\
| * Refactor error handling in Algorithm.prepare_key() methodsfix-key-errorsMark Adams2017-03-147-40/+68
|/
* Add support for public keys in OpenSSH (RFC 4253) format.Mark Adams2017-03-142-1/+6
* Add a failing test for OpenSSH-formatted ECDSA public keysMark Adams2017-03-142-0/+8
* Merge pull request #235 from bluetech/replace-cryptography-deprecatedMark Adams2016-12-172-4/+4
|\
| * Require cryptography >= 1.0, replace deprecated functionRan Benita2016-12-172-4/+4
|/
* Merge pull request #231 from vimalloc/masterMark Adams2016-11-307-2/+25
|\
| * Update change log for this prLandon GB2016-11-301-0/+1
| * python2.6 does not support set literalsLandon GB2016-11-301-2/+2
| * Changes per code reviewLandon GB2016-11-303-44/+21
| * Unit test for better errors when missing cryptography packageLandon GB2016-11-281-0/+6
| * Fix all flake8 issues tox is complaining aboutLandon GB2016-11-285-3/+6
| * Removing accidently comma (no, this shouldn't be a tupple)Landon GB2016-11-281-1/+1
| * Merge remote-tracking branch 'upstream/master'Landon GB2016-11-2818-189/+630
| |\ | |/ |/|
* | Merge pull request #221 from adamchainz/readmeJosé Padilla2016-11-124-55/+58
|\ \
| * | Convert README from Markdown to reStructuredTextAdam Chainz2016-11-124-55/+58
|/ /
* | Merge pull request #187 from jpadilla/fix-cli-scriptMark Adams2016-10-243-3/+10
|\ \
| * | Renamed jwt CLI script to jwt-cli to avoid issues with jwt script overlapping...fix-cli-scriptMark Adams2016-10-243-3/+10
|/ /
* | Merge pull request #225 from jpadilla/ecdsa-bkwards-compatMark Adams2016-10-241-0/+1
|\ \
| * | Add back 'ES512' for backward compatibility (for now)ecdsa-bkwards-compatMark Adams2016-10-241-0/+1
* | | Merge pull request #196 from kepkin/patch-1Mark Adams2016-10-241-1/+1
|\ \ \ | |/ / |/| |
| * | Fix rpm buildkepkin2016-02-031-1/+1
* | | Merge pull request #219 from mike9005/es521_fixMark Adams2016-10-243-6/+6
|\ \ \
| * | | Catch a couple more typos in testsMichael Collis2016-09-261-2/+2
| * | | Fix tests to matchMichael Collis2016-09-211-2/+2
| * | | Fix typo in rstMichael Collis2016-09-211-1/+1
| * | | Fix typo in AlgorithmsMichael Collis2016-09-211-1/+1
* | | | Merge pull request #220 from adamchainz/readthedocs.ioMark Adams2016-10-241-1/+1
|\ \ \ \
| * | | | Convert readthedocs link for their .org -> .io migration for hosted projectsAdam Chainz2016-09-291-1/+1
| |/ / /
* | | | Merge pull request #202 from jpadilla/add-jwk-for-hmac-rsaMark Adams2016-10-2411-130/+554
|\ \ \ \ | |/ / / |/| | |
| * | | Add JWK support for HMAC and RSA keysadd-jwk-for-hmac-rsaMark Adams2016-08-2811-130/+554
* | | | Merge pull request #218 from vimalloc/patch-1Mark Adams2016-09-141-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Add readthedocs link in README.mdLandon2016-09-141-0/+5
|/ / /
| | * Better error messages when missing cryptography packageLandon GB2016-11-282-13/+48
| |/ |/|
* | Bump version to 1.4.2 and update CHANGELOG1.4.2Mark Adams2016-08-082-1/+20
* | Merge pull request #213 from jpadilla/fix-type-error-on-bytes-keyMark Adams2016-08-073-9/+27
|\ \
| * | Fix a bug where a PEM private key as bytes raises a TypeErrorfix-type-error-on-bytes-keyMark Adams2016-08-044-10/+30
* | | Merge pull request #214 from jpadilla/fix-flake8Mark Adams2016-08-051-1/+3
|\ \ \ | |/ / |/| |
| * | Flake8 now ignores .toxfix-flake8Mark Adams2016-08-051-1/+3
|/ /
* | Bump up version1.4.1José Padilla2016-07-131-1/+1
* | Merge pull request #203 from jpadilla/add-python-35José Padilla2016-05-074-5/+10
|\ \
| * | Add Python 3.5 to CI buildsadd-python-35Mark Adams2016-05-064-5/+10
| |/
* | Merge pull request #201 from jpadilla/madams/cleanup-test-skipsMark Adams2016-05-061-4/+0
|\ \ | |/ |/|
| * Remove some erroenous @pytest.mark.skipif decoratorsmadams/cleanup-test-skipsMark Adams2016-05-051-4/+0
|/
* Merge pull request #192 from gthb/patch-1Mark Adams2016-01-181-1/+1
|\
| * Reflect that --no-verify also ignores claimsGunnlaugur Thor Briem2015-11-301-1/+1
|/
* Merge pull request #189 from mattijohn/masterJosé Padilla2015-11-111-2/+2
|\
| * Fix imports in code exampleMatti John2015-11-111-2/+2
|/
* Merge pull request #188 from sampwing/masterJosé Padilla2015-10-261-1/+1
|\
| * Fixed example usageSam Wing2015-10-261-1/+1
|/