stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6682411: JCK test failed w/ ArrayIndexOutOfBoundException (-1) when decrypting with no data

Browse Source 
Fixed PKCS5Padding class with additional check and throw BadPaddingException if the check failed

Reviewed-by: wetmore
This commit is contained in:
Valerie Peng 2008-03-31 16:12:37 -07:00
parent 3470103a93
commit c10465ee58
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
View File

@ -72,7 +72,7 @@ final class P11Cipher extends CipherSpi {
// DEC: return the length of trailing padding bytes given the specified
// padded data
int unpad(byte[] paddedData, int ofs, int len)
int unpad(byte[] paddedData, int len)
throws BadPaddingException;
}
@ -94,14 +94,17 @@ final class P11Cipher extends CipherSpi {
return padLen;
}
public int unpad(byte[] paddedData, int ofs, int len)
public int unpad(byte[] paddedData, int len)
throws BadPaddingException {
byte padValue = paddedData[ofs + len - 1];
if (len < 1 || len > paddedData.length) {
throw new BadPaddingException("Invalid pad array length!");
}
byte padValue = paddedData[len - 1];
if (padValue < 1 || padValue > blockSize) {
throw new BadPaddingException("Invalid pad value!");
}
// sanity check padding bytes
int padStartIndex = ofs + len - padValue;
int padStartIndex = len - padValue;
for (int i = padStartIndex; i < len; i++) {
if (paddedData[i] != padValue) {
throw new BadPaddingException("Invalid pad bytes!");
@ -712,7 +715,7 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_DecryptFinal(session.id(), 0, padBuffer, k,
padBuffer.length - k);
int actualPadLen = paddingObj.unpad(padBuffer, 0, k);
int actualPadLen = paddingObj.unpad(padBuffer, k);
k -= actualPadLen;
System.arraycopy(padBuffer, 0, out, outOfs, k);
} else {
@ -781,7 +784,7 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_DecryptFinal(session.id(),
0, padBuffer, k, padBuffer.length - k);
int actualPadLen = paddingObj.unpad(padBuffer, 0, k);
int actualPadLen = paddingObj.unpad(padBuffer, k);
k -= actualPadLen;
outArray = padBuffer;
outOfs = 0;