archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8204196: integer cleanup

Browse source 
Reviewed-by: xuelei
This commit is contained in:
Anthony Scarpino 2018-07-20 09:55:15 -07:00
parent f53e04ead9
commit 4e46cc1392
7 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
View file

@ -332,7 +332,7 @@ public final class RSACipher extends CipherSpi {
if ((inLen == 0) || (in == null)) {
return;
}
if (bufOfs + inLen > buffer.length) {
if (inLen > (buffer.length - bufOfs)) {
bufOfs = buffer.length + 1;
return;
}

2
src/java.base/share/classes/javax/crypto/Cipher.java
View file

@ -2739,7 +2739,7 @@ public class Cipher {
// Input sanity check
if ((src == null) || (offset < 0) || (len < 0)
|| ((len + offset) > src.length)) {
|| len > (src.length - offset)) {
throw new IllegalArgumentException("Bad arguments");
}

4
src/java.base/share/classes/sun/security/provider/DSA.java
View file

@ -588,7 +588,7 @@ abstract class DSA extends SignatureSpi {
}
}
protected void engineUpdate(byte[] input, int offset, int len) {
if (ofs + len > digestBuffer.length) {
if (len > (digestBuffer.length - ofs)) {
ofs = Integer.MAX_VALUE;
} else {
System.arraycopy(input, offset, digestBuffer, ofs, len);
@ -597,7 +597,7 @@ abstract class DSA extends SignatureSpi {
}
protected final void engineUpdate(ByteBuffer input) {
int inputLen = input.remaining();
if (ofs + inputLen > digestBuffer.length) {
if (inputLen > (digestBuffer.length - ofs)) {
ofs = Integer.MAX_VALUE;
} else {
input.get(digestBuffer, ofs, inputLen);

2
src/java.base/share/classes/sun/security/x509/AlgorithmId.java
View file

@ -1039,7 +1039,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
* @return the default alg, might be null if unsupported
*/
public static String getDefaultSigAlgForKey(PrivateKey k) {
switch (k.getAlgorithm().toUpperCase(Locale.ROOT)) {
switch (k.getAlgorithm().toUpperCase(Locale.ENGLISH)) {
case "EC":
return ecStrength(KeyUtil.getKeySize(k))
+ "withECDSA";