github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed non-RSA algorithms from JWE encrypter/decrypter functions

pull/210/head
Justin Richer 2012-09-06 17:28:17 -04:00
parent 558a6286e2
commit 42389286e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-common/src/main/java/org/mitre/jwt/encryption/impl/RsaDecrypter.java
View File

@ -30,7 +30,7 @@ public class RsaDecrypter extends AbstractJweDecrypter {
Jwe jwe = Jwe.parse(encryptedJwe); Jwe jwe = Jwe.parse(encryptedJwe);
String alg = jwe.getHeader().getAlgorithm(); String alg = jwe.getHeader().getAlgorithm();
if(alg.equals("RSA1_5") || alg.equals("RSA-OAEP") || alg.equals("ECDH-ES") || alg.equals("A128KW") || alg.equals("A256KW")) { if(alg.equals("RSA1_5") || alg.equals("RSA-OAEP")) {
//decrypt to get cmk to be used for cek and cik //decrypt to get cmk to be used for cek and cik
jwe.setEncryptedKey(decryptEncryptionKey(jwe)); jwe.setEncryptedKey(decryptEncryptionKey(jwe));

2
openid-connect-common/src/main/java/org/mitre/jwt/encryption/impl/RsaEncrypter.java
View File

@ -31,7 +31,7 @@ public class RsaEncrypter extends AbstractJweEncrypter {
String alg = jwe.getHeader().getAlgorithm(); String alg = jwe.getHeader().getAlgorithm();
String integrityAlg = jwe.getHeader().getIntegrity(); String integrityAlg = jwe.getHeader().getIntegrity();
if(alg.equals("RSA1_5") || alg.equals("RSA-OAEP") || alg.equals("ECDH-ES") || alg.equals("A128KW") || alg.equals("A256KW")) { if(alg.equals("RSA1_5") || alg.equals("RSA-OAEP")) {
//generate random content master key //generate random content master key