jdk-sandbox: comparison jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java

equal deleted inserted replaced

-:32e2fd6206d1
+:db7c5592a47f
 }
 byte padValue = lastData[lastData.length - 1];
 if (padValue < 1 || padValue > blockSize) {
 UcryptoProvider.debug("PKCS5Padding: unpad, lastData: " + Arrays.toString(lastData));
 UcryptoProvider.debug("PKCS5Padding: unpad, padValue=" + padValue);
-throw new BadPaddingException("Invalid pad value!");
+throw new BadPaddingException("Invalid pad value: " + padValue);
 }
 // sanity check padding bytes
 int padStartIndex = lastData.length - padValue;
 for (int i = padStartIndex; i < lastData.length; i++) {
 // truncate off extra bytes
 if (actualOut != out.length) {
 out = Arrays.copyOf(out, actualOut);
 }
 } catch (ShortBufferException sbe) {
-throw new UcryptoException("Internal Error");
+throw new UcryptoException("Internal Error", sbe);
 } finally {
 reset();
 }
 return out;
 }
 throws ShortBufferException, IllegalBlockSizeException,
 BadPaddingException {
 int estimatedOutLen = engineGetOutputSize(inLen);
 if (out.length - outOfs < estimatedOutLen) {
-throw new ShortBufferException();
+throw new ShortBufferException("Actual: " + (out.length - outOfs) +
+". Estimated Out Length: " + estimatedOutLen);
 }
 try {
 if (nc.encrypt) {
 int k = nc.engineUpdate(in, inOfs, inLen, out, outOfs);
 lastBlockLen += inLen;