summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adams <mark@markadams.me>2015-04-10 18:10:27 -0500
committerMark Adams <mark@markadams.me>2015-04-10 18:10:27 -0500
commit77e69ff6e06b3c7fa0e273f25607f3d00285a84b (patch)
tree5a11b78ddb50bb2d6edbd93cccb4b44e006abd9d
parent68d1f89a957549bfca76af293815fb2c55d59d53 (diff)
downloadpyjwt-77e69ff6e06b3c7fa0e273f25607f3d00285a84b.tar.gz
Updated README and CHANGELOG
-rw-r--r--CHANGELOG.md4
-rw-r--r--README.md5
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1564f5e..7e2b77d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
[Unreleased][unreleased]
-------------------------------------------------------------------------
### Changed
+- Added flexible and complete verification options during decode #131
+- Added support for PS256, PS384, and PS512 algorithms. #132
- Added this CHANGELOG.md file
-- Added flexible and complete verification options. #131
+
### Fixed
- Placeholder
diff --git a/README.md b/README.md
index 5ae0b40..22d088b 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ except jwt.InvalidTokenError:
```
You may also override exception checking via an `options` dictionary. The default
-options are as follows:
+options are as follows:
```python
options = {
@@ -112,6 +112,9 @@ currently supports:
* RS256 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-256 hash algorithm
* RS384 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-384 hash algorithm
* RS512 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-512 hash algorithm
+* PS256 - RSASSA-PSS signature using SHA-256 and MGF1 padding with SHA-256
+* PS384 - RSASSA-PSS signature using SHA-384 and MGF1 padding with SHA-384
+* PS512 - RSASSA-PSS signature using SHA-512 and MGF1 padding with SHA-512
### Encoding
You can specify which algorithm you would like to use to sign the JWT