honeymoose
/
jjwt
mirror of https://github.com/jwtk/jjwt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into android

This commit is contained in:
Les Hazlewood 2015-04-27 17:29:49 -07:00
parent e983155326 dcf4d75148
commit 0d99197a0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -76,7 +76,7 @@ try {
* Creating and parsing plaintext compact JWTs * Creating and parsing plaintext compact JWTs
* Creating, parsing and verifying digitally signed compact JWTs (aka JWSs) with the following algorithms: * Creating, parsing and verifying digitally signed compact JWTs (aka JWSs) with the following algorithms:
* HS256: HMAC using SHA-384 * HS256: HMAC using SHA-256
* HS384: HMAC using SHA-384 * HS384: HMAC using SHA-384
* HS512: HMAC using SHA-512 * HS512: HMAC using SHA-512
* RS256: RSASSA-PKCS-v1_5 using SHA-256 * RS256: RSASSA-PKCS-v1_5 using SHA-256

2
src/main/java/io/jsonwebtoken/SigningKeyResolverAdapter.java
View File

@ -32,7 +32,7 @@ import java.security.Key;
* calling code in known situations, and it is expected that you override the implementation in those known situations; * calling code in known situations, and it is expected that you override the implementation in those known situations;
* non-overridden *KeyBytes methods indicates that the JWS input was unexpected.</p> * non-overridden *KeyBytes methods indicates that the JWS input was unexpected.</p>
* *
* <p>If either {@link #resolveSigningKey(JwsHeader, String)} or {@link #resolveSigningKey(JwsHeader, String)} * <p>If either {@link #resolveSigningKey(JwsHeader, String)} or {@link #resolveSigningKey(JwsHeader, Claims)}
* are not overridden, one (or both) of the *KeyBytes variants must be overridden depending on your expected * are not overridden, one (or both) of the *KeyBytes variants must be overridden depending on your expected
* use case. You do not have to override any method that does not represent an expected condition.</p> * use case. You do not have to override any method that does not represent an expected condition.</p>
* *