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

switched to Guava for parsing ints into bytes, addresses #154

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

14
openid-connect-common/src/main/java/org/mitre/jwt/encryption/AbstractJweDecrypter.java
View File

@ -3,6 +3,8 @@ package org.mitre.jwt.encryption;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import com.google.common.primitives.Ints;
public abstract class AbstractJweDecrypter implements JweDecrypter { public abstract class AbstractJweDecrypter implements JweDecrypter {
long MAX_HASH_INPUTLEN = Long.MAX_VALUE; long MAX_HASH_INPUTLEN = Long.MAX_VALUE;
@ -25,13 +27,13 @@ public abstract class AbstractJweDecrypter implements JweDecrypter {
throw new IllegalArgumentException("Key derivation failed"); throw new IllegalArgumentException("Key derivation failed");
} }
int counter = 1; int counter = 1;
byte[] counterInBytes = intToFourBytes(counter); byte[] counterInBytes = Ints.toByteArray(counter);
if ((counterInBytes.length + cmk.length + type.length) * 8 > MAX_HASH_INPUTLEN) { if ((counterInBytes.length + cmk.length + type.length) * 8 > MAX_HASH_INPUTLEN) {
throw new IllegalArgumentException("Key derivation failed"); throw new IllegalArgumentException("Key derivation failed");
} }
for (int i = 0; i <= reps; i++) { for (int i = 0; i <= reps; i++) {
md.reset(); md.reset();
md.update(intToFourBytes(i + 1)); md.update(Ints.toByteArray(i + 1));
md.update(cmk); md.update(cmk);
md.update(type); md.update(type);
byte[] hash = md.digest(); byte[] hash = md.digest();
@ -45,12 +47,4 @@ public abstract class AbstractJweDecrypter implements JweDecrypter {
} }
public byte[] intToFourBytes(int i) {
byte[] res = new byte[4];
res[0] = (byte) (i >>> 24);
res[1] = (byte) ((i >>> 16) & 0xFF);
res[2] = (byte) ((i >>> 8) & 0xFF);
res[3] = (byte) (i & 0xFF);
return res;
}
} }

17
openid-connect-common/src/main/java/org/mitre/jwt/encryption/AbstractJweEncrypter.java
View File

@ -3,6 +3,9 @@ package org.mitre.jwt.encryption;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import com.google.common.primitives.Bytes;
import com.google.common.primitives.Ints;
public abstract class AbstractJweEncrypter implements JweEncrypter { public abstract class AbstractJweEncrypter implements JweEncrypter {
public MessageDigest md; public MessageDigest md;
@ -25,13 +28,13 @@ public abstract class AbstractJweEncrypter implements JweEncrypter {
throw new IllegalArgumentException("Key derivation failed"); throw new IllegalArgumentException("Key derivation failed");
} }
int counter = 1; int counter = 1;
byte[] counterInBytes = intToFourBytes(counter); byte[] counterInBytes = Ints.toByteArray(counter);
if ((counterInBytes.length + cmk.length + type.length) * 8 > MAX_HASH_INPUTLEN) { if ((counterInBytes.length + cmk.length + type.length) * 8 > MAX_HASH_INPUTLEN) {
throw new IllegalArgumentException("Key derivation failed"); throw new IllegalArgumentException("Key derivation failed");
} }
for (int i = 0; i <= reps; i++) { for (int i = 0; i <= reps; i++) {
md.reset(); md.reset();
md.update(intToFourBytes(i + 1)); md.update(Ints.toByteArray(i + 1));
md.update(cmk); md.update(cmk);
md.update(type); md.update(type);
byte[] hash = md.digest(); byte[] hash = md.digest();
@ -45,14 +48,4 @@ public abstract class AbstractJweEncrypter implements JweEncrypter {
} }
// this is a utility function, shouldn't be in the public interface for this class
protected byte[] intToFourBytes(int i) {
byte[] res = new byte[4];
res[0] = (byte) (i >>> 24);
res[1] = (byte) ((i >>> 16) & 0xFF);
res[2] = (byte) ((i >>> 8) & 0xFF);
res[3] = (byte) (i & 0xFF);
return res;
}
} }