resolved_method->name() != vmSymbols::object_initializer_name()) {
- // check if this is an old-style super call and do a new lookup if so
+ // check if this is an old-style super call and do a new lookup if so
// a) check if ACC_SUPER flag is set for the current class
+ Klass* current_klass = link_info.current_klass();
if ((current_klass->is_super() || !AllowNonVirtualCalls) &&
// b) check if the class of the resolved_klass is a superclass
// (not supertype in order to exclude interface classes) of the current class.
@@ -1200,6 +1197,9 @@ void LinkResolver::runtime_resolve_special_method(CallInfo& result,
Method::name_and_sig_as_C_string(resolved_klass,
resolved_method->name(),
resolved_method->signature()));
+ // check loader constraints if found a different method
+ } else if (sel_method() != resolved_method()) {
+ check_method_loader_constraints(link_info, sel_method, "method", CHECK);
}
}
diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
index 1664f1bbf09..6ca18a8ae54 100644
--- a/src/hotspot/share/interpreter/linkResolver.hpp
+++ b/src/hotspot/share/interpreter/linkResolver.hpp
@@ -233,11 +233,10 @@ class LinkResolver: AllStatic {
static methodHandle linktime_resolve_interface_method (const LinkInfo& link_info, TRAPS);
static void runtime_resolve_special_method (CallInfo& result,
+ const LinkInfo& link_info,
const methodHandle& resolved_method,
- Klass* resolved_klass,
- Klass* current_klass,
- Handle recv,
- bool check_access, TRAPS);
+ Handle recv, TRAPS);
+
static void runtime_resolve_virtual_method (CallInfo& result,
const methodHandle& resolved_method,
Klass* resolved_klass,
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java
index 9d11f0091df..1fefe6e1adf 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -156,7 +156,7 @@ abstract class AESCipher extends CipherSpi {
throw new InvalidKeyException("Key encoding must not be null");
} else if (value.length != fixedKeySize) {
throw new InvalidKeyException("The key must be " +
- fixedKeySize*8 + " bits");
+ fixedKeySize + " bytes");
}
}
}
@@ -509,7 +509,7 @@ abstract class AESCipher extends CipherSpi {
throw new InvalidKeyException("Invalid AES key length: " +
encoded.length + " bytes");
}
- return encoded.length * 8;
+ return Math.multiplyExact(encoded.length, 8);
}
/**
@@ -628,9 +628,9 @@ abstract class AESCipher extends CipherSpi {
}
if (src != null) {
int aadLen = src.limit() - src.position();
- if (aadLen != 0) {
+ if (aadLen > 0) {
if (src.hasArray()) {
- int aadOfs = src.arrayOffset() + src.position();
+ int aadOfs = Math.addExact(src.arrayOffset(), src.position());
core.updateAAD(src.array(), aadOfs, aadLen);
src.position(src.limit());
} else {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java
index 29a22ad64b6..95a8c5a6fac 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESWrapCipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -156,7 +156,7 @@ abstract class AESWrapCipher extends CipherSpi {
if (decrypting) {
result = inputLen - 8;
} else {
- result = inputLen + 8;
+ result = Math.addExact(inputLen, 8);
}
return (result < 0? 0:result);
}
@@ -378,7 +378,7 @@ abstract class AESWrapCipher extends CipherSpi {
throw new InvalidKeyException("Invalid key length: " +
encoded.length + " bytes");
}
- return encoded.length * 8;
+ return Math.multiplyExact(encoded.length, 8);
}
/**
@@ -404,7 +404,7 @@ abstract class AESWrapCipher extends CipherSpi {
throw new InvalidKeyException("Cannot get an encoding of " +
"the key to be wrapped");
}
- byte[] out = new byte[keyVal.length + 8];
+ byte[] out = new byte[Math.addExact(keyVal.length, 8)];
if (keyVal.length == 8) {
System.arraycopy(IV, 0, out, 0, IV.length);
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
index f5b99c1ae51..cfa48358831 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -257,7 +257,7 @@ public final class ARCFOURCipher extends CipherSpi {
// see JCE spec
protected int engineGetKeySize(Key key) throws InvalidKeyException {
byte[] encodedKey = getEncodedKey(key);
- return encodedKey.length << 3;
+ return Math.multiplyExact(encodedKey.length, 8);
}
}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java
index 54de9984ebf..e991108e8e8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -373,7 +373,7 @@ public final class BlowfishCipher extends CipherSpi {
* @exception InvalidKeyException if key is invalid.
*/
protected int engineGetKeySize(Key key) throws InvalidKeyException {
- return (key.getEncoded().length * 8);
+ return Math.multiplyExact(key.getEncoded().length, 8);
}
/**
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
index 106ee91392c..87f47722e48 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -324,13 +324,14 @@ final class CipherCore {
}
private int getOutputSizeByOperation(int inputLen, boolean isDoFinal) {
- int totalLen = buffered + inputLen + cipher.getBufferedLength();
+ int totalLen = Math.addExact(buffered, cipher.getBufferedLength());
+ totalLen = Math.addExact(totalLen, inputLen);
switch (cipherMode) {
case GCM_MODE:
if (isDoFinal) {
int tagLen = ((GaloisCounterMode) cipher).getTagLen();
if (!decrypting) {
- totalLen += tagLen;
+ totalLen = Math.addExact(totalLen, tagLen);
} else {
totalLen -= tagLen;
}
@@ -346,10 +347,10 @@ final class CipherCore {
totalLen = diffBlocksize;
} else {
int residue = (totalLen - diffBlocksize) % blockSize;
- totalLen += (blockSize - residue);
+ totalLen = Math.addExact(totalLen, (blockSize - residue));
}
} else {
- totalLen += padding.padLength(totalLen);
+ totalLen = Math.addExact(totalLen, padding.padLength(totalLen));
}
}
break;
@@ -711,7 +712,8 @@ final class CipherCore {
}
// figure out how much can be sent to crypto function
- int len = buffered + inputLen - minBytes;
+ int len = Math.addExact(buffered, inputLen);
+ len -= minBytes;
if (padding != null && decrypting) {
// do not include the padding bytes when decrypting
len -= blockSize;
@@ -730,12 +732,12 @@ final class CipherCore {
int outLen = 0;
if (len != 0) { // there is some work to do
if ((input == output)
- && (outputOffset < (inputOffset + inputLen))
- && (inputOffset < (outputOffset + buffer.length))) {
+ && (outputOffset - inputOffset < inputLen)
+ && (inputOffset - outputOffset < buffer.length)) {
// copy 'input' out to avoid its content being
// overwritten prematurely.
input = Arrays.copyOfRange(input, inputOffset,
- inputOffset + inputLen);
+ Math.addExact(inputOffset, inputLen));
inputOffset = 0;
}
if (len <= buffered) {
@@ -757,13 +759,13 @@ final class CipherCore {
if (bufferCapacity != 0) {
temp = Math.min(bufferCapacity, inputConsumed);
if (unitBytes != blockSize) {
- temp -= ((buffered + temp) % unitBytes);
+ temp -= (Math.addExact(buffered, temp) % unitBytes);
}
System.arraycopy(input, inputOffset, buffer, buffered, temp);
- inputOffset += temp;
+ inputOffset = Math.addExact(inputOffset, temp);
inputConsumed -= temp;
inputLen -= temp;
- buffered += temp;
+ buffered = Math.addExact(buffered, temp);
}
// process 'buffer'
if (decrypting) {
@@ -771,7 +773,7 @@ final class CipherCore {
} else {
outLen = cipher.encrypt(buffer, 0, buffered, output, outputOffset);
}
- outputOffset += outLen;
+ outputOffset = Math.addExact(outputOffset, outLen);
buffered = 0;
}
if (inputConsumed > 0) { // still has input to process
@@ -802,7 +804,7 @@ final class CipherCore {
if (inputLen > 0) {
System.arraycopy(input, inputOffset, buffer, buffered,
inputLen);
- buffered += inputLen;
+ buffered = Math.addExact(buffered, inputLen);
}
return outLen;
}
@@ -912,10 +914,10 @@ final class CipherCore {
}
// calculate total input length
- int len = buffered + inputLen;
+ int len = Math.addExact(buffered, inputLen);
// calculate padding length
- int totalLen = len + cipher.getBufferedLength();
+ int totalLen = Math.addExact(len, cipher.getBufferedLength());
int paddingLen = 0;
// will the total input length be a multiple of blockSize?
if (unitBytes != blockSize) {
@@ -948,12 +950,12 @@ final class CipherCore {
int finalBufLen = inputLen;
if ((buffered != 0) || (!decrypting && padding != null) ||
((input == output)
- && (outputOffset < (inputOffset + inputLen))
- && (inputOffset < (outputOffset + buffer.length)))) {
+ && (outputOffset - inputOffset < inputLen)
+ && (inputOffset - outputOffset < buffer.length))) {
if (decrypting || padding == null) {
paddingLen = 0;
}
- finalBuf = new byte[len + paddingLen];
+ finalBuf = new byte[Math.addExact(len, paddingLen)];
finalOffset = 0;
if (buffered != 0) {
System.arraycopy(buffer, 0, finalBuf, 0, buffered);
@@ -963,7 +965,7 @@ final class CipherCore {
buffered, inputLen);
}
if (paddingLen != 0) {
- padding.padWithLen(finalBuf, (buffered+inputLen), paddingLen);
+ padding.padWithLen(finalBuf, Math.addExact(buffered, inputLen), paddingLen);
}
finalBufLen = finalBuf.length;
}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
index 68b2cbac64d..df00ec2736c 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@ public final class DESedeWrapCipher extends CipherSpi {
if (decrypting) {
result = inputLen - 16; // CHECKSUM_LEN + IV_LEN;
} else {
- result = inputLen + 16;
+ result = Math.addExact(inputLen, 16);
}
return (result < 0? 0:result);
}
@@ -449,11 +449,11 @@ public final class DESedeWrapCipher extends CipherSpi {
}
byte[] cks = getChecksum(keyVal);
- byte[] in = new byte[keyVal.length + CHECKSUM_LEN];
+ byte[] in = new byte[Math.addExact(keyVal.length, CHECKSUM_LEN)];
System.arraycopy(keyVal, 0, in, 0, keyVal.length);
System.arraycopy(cks, 0, in, keyVal.length, CHECKSUM_LEN);
- byte[] out = new byte[iv.length + in.length];
+ byte[] out = new byte[Math.addExact(iv.length, in.length)];
System.arraycopy(iv, 0, out, 0, iv.length);
cipher.encrypt(in, 0, in.length, out, iv.length);
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
index 2322741110a..3399cc5a3a8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHGenParameterSpec;
import sun.security.provider.ParameterCache;
+import static sun.security.util.SecurityProviderConstants.DEF_DH_KEY_SIZE;
/**
* This class represents the key pair generator for Diffie-Hellman key pairs.
@@ -42,8 +43,7 @@ import sun.security.provider.ParameterCache;
*
* By providing the size in bits of the prime modulus -
* This will be used to create a prime modulus and base generator, which will
- * then be used to create the Diffie-Hellman key pair. The default size of the
- * prime modulus is 2048 bits.
+ * then be used to create the Diffie-Hellman key pair.
* By providing a prime modulus and base generator
*
*
@@ -68,7 +68,7 @@ public final class DHKeyPairGenerator extends KeyPairGeneratorSpi {
public DHKeyPairGenerator() {
super();
- initialize(2048, null);
+ initialize(DEF_DH_KEY_SIZE, null);
}
private static void checkKeySize(int keysize)
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
index f8001b5ab20..293dfd895a3 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@ import java.security.spec.*;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHGenParameterSpec;
+import static sun.security.util.SecurityProviderConstants.DEF_DH_KEY_SIZE;
+
/*
* This class generates parameters for the Diffie-Hellman algorithm.
* The parameters are a prime, a base, and optionally the length in bits of
@@ -38,7 +40,6 @@ import javax.crypto.spec.DHGenParameterSpec;
*
* The Diffie-Hellman parameter generation accepts the size in bits of the
* prime modulus and the size in bits of the random exponent as input.
- * The size of the prime modulus defaults to 2048 bits.
*
* @author Jan Luehe
*
@@ -50,7 +51,7 @@ import javax.crypto.spec.DHGenParameterSpec;
public final class DHParameterGenerator extends AlgorithmParameterGeneratorSpi {
// The size in bits of the prime modulus
- private int primeSize = 2048;
+ private int primeSize = DEF_DH_KEY_SIZE;
// The size in bits of the random exponent (private value)
private int exponentSize = 0;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
index a7134238e14..6562a107607 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,8 @@ final class ISO10126Padding implements Padding {
if (in == null)
return;
- if ((off + len) > in.length) {
+ int idx = Math.addExact(off, len);
+ if (idx > in.length) {
throw new ShortBufferException("Buffer too small to hold padding");
}
@@ -71,7 +72,7 @@ final class ISO10126Padding implements Padding {
byte[] padding = new byte[len - 1];
SunJCE.getRandom().nextBytes(padding);
System.arraycopy(padding, 0, in, off, len - 1);
- in[off + len - 1] = paddingOctet;
+ in[idx - 1] = paddingOctet;
return;
}
@@ -94,14 +95,15 @@ final class ISO10126Padding implements Padding {
return 0;
}
- byte lastByte = in[off + len - 1];
+ int idx = Math.addExact(off, len);
+ byte lastByte = in[idx - 1];
int padValue = (int)lastByte & 0x0ff;
if ((padValue < 0x01)
|| (padValue > blockSize)) {
return -1;
}
- int start = off + len - padValue;
+ int start = idx - padValue;
if (start < off) {
return -1;
}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
index ccf49b7a802..f3190b39a29 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,14 @@ package com.sun.crypto.provider;
import java.io.*;
import java.util.*;
+import java.security.AccessController;
import java.security.DigestInputStream;
import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Key;
import java.security.PrivateKey;
+import java.security.PrivilegedAction;
import java.security.KeyStoreSpi;
import java.security.KeyStoreException;
import java.security.UnrecoverableKeyException;
@@ -835,11 +837,21 @@ public final class JceKeyStore extends KeyStoreSpi {
// read the sealed key
try {
ois = new ObjectInputStream(dis);
+ final ObjectInputStream ois2 = ois;
+ // Set a deserialization checker
+ AccessController.doPrivileged(
+ (PrivilegedAction)() -> {
+ ois2.setObjectInputFilter(
+ new DeserializationChecker());
+ return null;
+ });
entry.sealedKey = (SealedObject)ois.readObject();
// NOTE: don't close ois here since we are still
// using dis!!!
} catch (ClassNotFoundException cnfe) {
throw new IOException(cnfe.getMessage());
+ } catch (InvalidClassException ice) {
+ throw new IOException("Invalid secret key format");
}
// Add the entry to the list
@@ -916,4 +928,34 @@ public final class JceKeyStore extends KeyStoreSpi {
return JCEKS_MAGIC == dataStream.readInt();
}
+
+ /*
+ * An ObjectInputFilter that checks the format of the secret key being
+ * deserialized.
+ */
+ private static class DeserializationChecker implements ObjectInputFilter {
+ private static final int MAX_NESTED_DEPTH = 2;
+
+ @Override
+ public ObjectInputFilter.Status
+ checkInput(ObjectInputFilter.FilterInfo info) {
+
+ // First run a custom filter
+ long nestedDepth = info.depth();
+ if ((nestedDepth == 1 &&
+ info.serialClass() != SealedObjectForKeyProtector.class) ||
+ nestedDepth > MAX_NESTED_DEPTH) {
+ return Status.REJECTED;
+ }
+
+ // Next run the default filter, if available
+ ObjectInputFilter defaultFilter =
+ ObjectInputFilter.Config.getSerialFilter();
+ if (defaultFilter != null) {
+ return defaultFilter.checkInput(info);
+ }
+
+ return Status.UNDECIDED;
+ }
+ }
}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
index 53fea3053cc..823d7bdb8d1 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.UnrecoverableKeyException;
import java.security.AlgorithmParameters;
+import java.security.spec.InvalidParameterSpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import javax.crypto.Cipher;
@@ -74,6 +75,8 @@ final class KeyProtector {
// keys in the keystore implementation that comes with JDK 1.2)
private static final String KEY_PROTECTOR_OID = "1.3.6.1.4.1.42.2.17.1.1";
+ private static final int MAX_ITERATION_COUNT = 5000000;
+ private static final int ITERATION_COUNT = 200000;
private static final int SALT_LEN = 20; // the salt length
private static final int DIGEST_LEN = 20;
@@ -100,7 +103,7 @@ final class KeyProtector {
SunJCE.getRandom().nextBytes(salt);
// create PBE parameters from salt and iteration count
- PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, 20);
+ PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -155,6 +158,9 @@ final class KeyProtector {
pbeParams.init(encodedParams);
PBEParameterSpec pbeSpec =
pbeParams.getParameterSpec(PBEParameterSpec.class);
+ if (pbeSpec.getIterationCount() > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -285,7 +291,7 @@ final class KeyProtector {
SunJCE.getRandom().nextBytes(salt);
// create PBE parameters from salt and iteration count
- PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, 20);
+ PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -326,6 +332,15 @@ final class KeyProtector {
throw new UnrecoverableKeyException("Cannot get " +
"algorithm parameters");
}
+ PBEParameterSpec pbeSpec;
+ try {
+ pbeSpec = params.getParameterSpec(PBEParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
+ throw new IOException("Invalid PBE algorithm parameters");
+ }
+ if (pbeSpec.getIterationCount() > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
PBEWithMD5AndTripleDESCipher cipherSpi;
cipherSpi = new PBEWithMD5AndTripleDESCipher();
Cipher cipher = new CipherForKeyProtector(cipherSpi,
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java
deleted file mode 100644
index 98f85cf04bd..00000000000
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.crypto.provider;
-
-import java.security.*;
-import java.security.spec.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-
-/**
- * This class represents password-based encryption as defined by the PKCS #5
- * standard.
- *
- * @author Jan Luehe
- *
- *
- * @see javax.crypto.Cipher
- */
-final class PBECipherCore {
-
- // the encapsulated DES cipher
- private CipherCore cipher;
- private MessageDigest md;
- private int blkSize;
- private String algo = null;
- private byte[] salt = null;
- private int iCount = 10;
-
- /**
- * Creates an instance of PBE Cipher using the specified CipherSpi
- * instance.
- *
- */
- PBECipherCore(String cipherAlg) throws NoSuchAlgorithmException,
- NoSuchPaddingException {
- algo = cipherAlg;
- if (algo.equals("DES")) {
- cipher = new CipherCore(new DESCrypt(),
- DESConstants.DES_BLOCK_SIZE);
- } else if (algo.equals("DESede")) {
-
- cipher = new CipherCore(new DESedeCrypt(),
- DESConstants.DES_BLOCK_SIZE);
- } else {
- throw new NoSuchAlgorithmException("No Cipher implementation " +
- "for PBEWithMD5And" + algo);
- }
- cipher.setMode("CBC");
- cipher.setPadding("PKCS5Padding");
- // get instance of MD5
- md = MessageDigest.getInstance("MD5");
- }
-
- /**
- * Sets the mode of this cipher. This algorithm can only be run in CBC
- * mode.
- *
- * @param mode the cipher mode
- *
- * @exception NoSuchAlgorithmException if the requested cipher mode is
- * invalid
- */
- void setMode(String mode) throws NoSuchAlgorithmException {
- cipher.setMode(mode);
- }
-
- /**
- * Sets the padding mechanism of this cipher. This algorithm only uses
- * PKCS #5 padding.
- *
- * @param padding the padding mechanism
- *
- * @exception NoSuchPaddingException if the requested padding mechanism
- * is invalid
- */
- void setPadding(String paddingScheme) throws NoSuchPaddingException {
- cipher.setPadding(paddingScheme);
- }
-
- /**
- * Returns the block size (in bytes).
- *
- * @return the block size (in bytes)
- */
- int getBlockSize() {
- return DESConstants.DES_BLOCK_SIZE;
- }
-
- /**
- * Returns the length in bytes that an output buffer would need to be in
- * order to hold the result of the next update or
- * doFinal operation, given the input length
- * inputLen (in bytes).
- *
- * This call takes into account any unprocessed (buffered) data from a
- * previous update call, and padding.
- *
- *
The actual output length of the next update or
- * doFinal call may be smaller than the length returned by
- * this method.
- *
- * @param inputLen the input length (in bytes)
- *
- * @return the required output buffer size (in bytes)
- *
- */
- int getOutputSize(int inputLen) {
- return cipher.getOutputSize(inputLen);
- }
-
- /**
- * Returns the initialization vector (IV) in a new buffer.
- *
- *
This is useful in the case where a random IV has been created
- * (see init ),
- * or in the context of password-based encryption or
- * decryption, where the IV is derived from a user-supplied password.
- *
- * @return the initialization vector in a new buffer, or null if the
- * underlying algorithm does not use an IV, or if the IV has not yet
- * been set.
- */
- byte[] getIV() {
- return cipher.getIV();
- }
-
- /**
- * Returns the parameters used with this cipher.
- *
- *
The returned parameters may be the same that were used to initialize
- * this cipher, or may contain the default set of parameters or a set of
- * randomly generated parameters used by the underlying cipher
- * implementation (provided that the underlying cipher implementation
- * uses a default set of parameters or creates new parameters if it needs
- * parameters but was not initialized with any).
- *
- * @return the parameters used with this cipher, or null if this cipher
- * does not use any parameters.
- */
- AlgorithmParameters getParameters() {
- AlgorithmParameters params = null;
- if (salt == null) {
- salt = new byte[8];
- SunJCE.getRandom().nextBytes(salt);
- }
- PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, iCount);
- try {
- params = AlgorithmParameters.getInstance("PBEWithMD5And" +
- (algo.equalsIgnoreCase("DES")? "DES":"TripleDES"),
- SunJCE.getInstance());
- params.init(pbeSpec);
- } catch (NoSuchAlgorithmException nsae) {
- // should never happen
- throw new RuntimeException("SunJCE called, but not configured");
- } catch (InvalidParameterSpecException ipse) {
- // should never happen
- throw new RuntimeException("PBEParameterSpec not supported");
- }
- return params;
- }
-
- /**
- * Initializes this cipher with a key, a set of
- * algorithm parameters, and a source of randomness.
- * The cipher is initialized for one of the following four operations:
- * encryption, decryption, key wrapping or key unwrapping, depending on
- * the value of opmode.
- *
- *
If this cipher (including its underlying feedback or padding scheme)
- * requires any random bytes, it will get them from random.
- *
- * @param opmode the operation mode of this cipher (this is one of
- * the following:
- * ENCRYPT_MODE, DECRYPT_MODE),
- * WRAP_MODE or UNWRAP_MODE)
- * @param key the encryption key
- * @param params the algorithm parameters
- * @param random the source of randomness
- *
- * @exception InvalidKeyException if the given key is inappropriate for
- * initializing this cipher
- * @exception InvalidAlgorithmParameterException if the given algorithm
- * parameters are inappropriate for this cipher
- */
- void init(int opmode, Key key, AlgorithmParameterSpec params,
- SecureRandom random)
- throws InvalidKeyException, InvalidAlgorithmParameterException {
- if (((opmode == Cipher.DECRYPT_MODE) ||
- (opmode == Cipher.UNWRAP_MODE)) && (params == null)) {
- throw new InvalidAlgorithmParameterException("Parameters "
- + "missing");
- }
- if ((key == null) ||
- (key.getEncoded() == null) ||
- !(key.getAlgorithm().regionMatches(true, 0, "PBE", 0, 3))) {
- throw new InvalidKeyException("Missing password");
- }
-
- if (params == null) {
- // create random salt and use default iteration count
- salt = new byte[8];
- random.nextBytes(salt);
- } else {
- if (!(params instanceof PBEParameterSpec)) {
- throw new InvalidAlgorithmParameterException
- ("Wrong parameter type: PBE expected");
- }
- salt = ((PBEParameterSpec) params).getSalt();
- // salt must be 8 bytes long (by definition)
- if (salt.length != 8) {
- throw new InvalidAlgorithmParameterException
- ("Salt must be 8 bytes long");
- }
- iCount = ((PBEParameterSpec) params).getIterationCount();
- if (iCount <= 0) {
- throw new InvalidAlgorithmParameterException
- ("IterationCount must be a positive number");
- }
- }
-
- byte[] derivedKey = deriveCipherKey(key);
- // use all but the last 8 bytes as the key value
- SecretKeySpec cipherKey = new SecretKeySpec(derivedKey, 0,
- derivedKey.length-8, algo);
- // use the last 8 bytes as the IV
- IvParameterSpec ivSpec = new IvParameterSpec(derivedKey,
- derivedKey.length-8,
- 8);
- // initialize the underlying cipher
- cipher.init(opmode, cipherKey, ivSpec, random);
- }
-
- private byte[] deriveCipherKey(Key key) {
-
- byte[] result = null;
- byte[] passwdBytes = key.getEncoded();
-
- if (algo.equals("DES")) {
- // P || S (password concatenated with salt)
- byte[] concat = new byte[passwdBytes.length + salt.length];
- System.arraycopy(passwdBytes, 0, concat, 0, passwdBytes.length);
- java.util.Arrays.fill(passwdBytes, (byte)0x00);
- System.arraycopy(salt, 0, concat, passwdBytes.length, salt.length);
-
- // digest P || S with c iterations
- byte[] toBeHashed = concat;
- for (int i = 0; i < iCount; i++) {
- md.update(toBeHashed);
- toBeHashed = md.digest(); // this resets the digest
- }
- java.util.Arrays.fill(concat, (byte)0x00);
- result = toBeHashed;
- } else if (algo.equals("DESede")) {
- // if the 2 salt halves are the same, invert one of them
- int i;
- for (i=0; i<4; i++) {
- if (salt[i] != salt[i+4])
- break;
- }
- if (i==4) { // same, invert 1st half
- for (i=0; i<2; i++) {
- byte tmp = salt[i];
- salt[i] = salt[3-i];
- salt[3-1] = tmp;
- }
- }
-
- // Now digest each half (concatenated with password). For each
- // half, go through the loop as many times as specified by the
- // iteration count parameter (inner for loop).
- // Concatenate the output from each digest round with the
- // password, and use the result as the input to the next digest
- // operation.
- byte[] kBytes = null;
- IvParameterSpec iv = null;
- byte[] toBeHashed = null;
- result = new byte[DESedeKeySpec.DES_EDE_KEY_LEN +
- DESConstants.DES_BLOCK_SIZE];
- for (i = 0; i < 2; i++) {
- toBeHashed = new byte[salt.length/2];
- System.arraycopy(salt, i*(salt.length/2), toBeHashed, 0,
- toBeHashed.length);
- for (int j=0; j < iCount; j++) {
- md.update(toBeHashed);
- md.update(passwdBytes);
- toBeHashed = md.digest(); // this resets the digest
- }
- System.arraycopy(toBeHashed, 0, result, i*16,
- toBeHashed.length);
- }
- }
- return result;
- }
-
- void init(int opmode, Key key, AlgorithmParameters params,
- SecureRandom random)
- throws InvalidKeyException, InvalidAlgorithmParameterException {
- PBEParameterSpec pbeSpec = null;
- if (params != null) {
- try {
- pbeSpec = params.getParameterSpec(PBEParameterSpec.class);
- } catch (InvalidParameterSpecException ipse) {
- throw new InvalidAlgorithmParameterException("Wrong parameter "
- + "type: PBE "
- + "expected");
- }
- }
- init(opmode, key, pbeSpec, random);
- }
-
- /**
- * Continues a multiple-part encryption or decryption operation
- * (depending on how this cipher was initialized), processing another data
- * part.
- *
- *
The first inputLen bytes in the input
- * buffer, starting at inputOffset, are processed, and the
- * result is stored in a new buffer.
- *
- * @param input the input buffer
- * @param inputOffset the offset in input where the input
- * starts
- * @param inputLen the input length
- *
- * @return the new buffer with the result
- *
- */
- byte[] update(byte[] input, int inputOffset, int inputLen) {
- return cipher.update(input, inputOffset, inputLen);
- }
-
- /**
- * Continues a multiple-part encryption or decryption operation
- * (depending on how this cipher was initialized), processing another data
- * part.
- *
- *
The first inputLen bytes in the input
- * buffer, starting at inputOffset, are processed, and the
- * result is stored in the output buffer, starting at
- * outputOffset.
- *
- * @param input the input buffer
- * @param inputOffset the offset in input where the input
- * starts
- * @param inputLen the input length
- * @param output the buffer for the result
- * @param outputOffset the offset in output where the result
- * is stored
- *
- * @return the number of bytes stored in output
- *
- * @exception ShortBufferException if the given output buffer is too small
- * to hold the result
- */
- int update(byte[] input, int inputOffset, int inputLen,
- byte[] output, int outputOffset)
- throws ShortBufferException {
- return cipher.update(input, inputOffset, inputLen,
- output, outputOffset);
- }
-
- /**
- * Encrypts or decrypts data in a single-part operation,
- * or finishes a multiple-part operation.
- * The data is encrypted or decrypted, depending on how this cipher was
- * initialized.
- *
- *
The first inputLen bytes in the input
- * buffer, starting at inputOffset, and any input bytes that
- * may have been buffered during a previous update operation,
- * are processed, with padding (if requested) being applied.
- * The result is stored in a new buffer.
- *
- *
The cipher is reset to its initial state (uninitialized) after this
- * call.
- *
- * @param input the input buffer
- * @param inputOffset the offset in input where the input
- * starts
- * @param inputLen the input length
- *
- * @return the new buffer with the result
- *
- * @exception IllegalBlockSizeException if this cipher is a block cipher,
- * no padding has been requested (only in encryption mode), and the total
- * input length of the data processed by this cipher is not a multiple of
- * block size
- * @exception BadPaddingException if decrypting and padding is chosen,
- * but the last input data does not have proper padding bytes.
- */
- byte[] doFinal(byte[] input, int inputOffset, int inputLen)
- throws IllegalBlockSizeException, BadPaddingException {
- return cipher.doFinal(input, inputOffset, inputLen);
- }
-
- /**
- * Encrypts or decrypts data in a single-part operation,
- * or finishes a multiple-part operation.
- * The data is encrypted or decrypted, depending on how this cipher was
- * initialized.
- *
- *
The first inputLen bytes in the input
- * buffer, starting at inputOffset, and any input bytes that
- * may have been buffered during a previous update operation,
- * are processed, with padding (if requested) being applied.
- * The result is stored in the output buffer, starting at
- * outputOffset.
- *
- *
The cipher is reset to its initial state (uninitialized) after this
- * call.
- *
- * @param input the input buffer
- * @param inputOffset the offset in input where the input
- * starts
- * @param inputLen the input length
- * @param output the buffer for the result
- * @param outputOffset the offset in output where the result
- * is stored
- *
- * @return the number of bytes stored in output
- *
- * @exception IllegalBlockSizeException if this cipher is a block cipher,
- * no padding has been requested (only in encryption mode), and the total
- * input length of the data processed by this cipher is not a multiple of
- * block size
- * @exception ShortBufferException if the given output buffer is too small
- * to hold the result
- * @exception BadPaddingException if decrypting and padding is chosen,
- * but the last input data does not have proper padding bytes.
- */
- int doFinal(byte[] input, int inputOffset, int inputLen,
- byte[] output, int outputOffset)
- throws ShortBufferException, IllegalBlockSizeException,
- BadPaddingException {
- return cipher.doFinal(input, inputOffset, inputLen,
- output, outputOffset);
- }
-
- /**
- * Wrap a key.
- *
- * @param key the key to be wrapped.
- *
- * @return the wrapped key.
- *
- * @exception IllegalBlockSizeException if this cipher is a block
- * cipher, no padding has been requested, and the length of the
- * encoding of the key to be wrapped is not a
- * multiple of the block size.
- *
- * @exception InvalidKeyException if it is impossible or unsafe to
- * wrap the key with this cipher (e.g., a hardware protected key is
- * being passed to a software only cipher).
- */
- byte[] wrap(Key key)
- throws IllegalBlockSizeException, InvalidKeyException {
- byte[] result = null;
-
- try {
- byte[] encodedKey = key.getEncoded();
- if ((encodedKey == null) || (encodedKey.length == 0)) {
- throw new InvalidKeyException("Cannot get an encoding of " +
- "the key to be wrapped");
- }
-
- result = doFinal(encodedKey, 0, encodedKey.length);
- } catch (BadPaddingException e) {
- // Should never happen
- }
-
- return result;
- }
-
- /**
- * Unwrap a previously wrapped key.
- *
- * @param wrappedKey the key to be unwrapped.
- *
- * @param wrappedKeyAlgorithm the algorithm the wrapped key is for.
- *
- * @param wrappedKeyType the type of the wrapped key.
- * This is one of Cipher.SECRET_KEY,
- * Cipher.PRIVATE_KEY, or Cipher.PUBLIC_KEY.
- *
- * @return the unwrapped key.
- *
- * @exception NoSuchAlgorithmException if no installed providers
- * can create keys of type wrappedKeyType for the
- * wrappedKeyAlgorithm.
- *
- * @exception InvalidKeyException if wrappedKey does not
- * represent a wrapped key of type wrappedKeyType for
- * the wrappedKeyAlgorithm.
- */
- Key unwrap(byte[] wrappedKey,
- String wrappedKeyAlgorithm,
- int wrappedKeyType)
- throws InvalidKeyException, NoSuchAlgorithmException {
- byte[] encodedKey;
- try {
- encodedKey = doFinal(wrappedKey, 0, wrappedKey.length);
- } catch (BadPaddingException ePadding) {
- throw new InvalidKeyException("The wrapped key is not padded " +
- "correctly");
- } catch (IllegalBlockSizeException eBlockSize) {
- throw new InvalidKeyException("The wrapped key does not have " +
- "the correct length");
- }
- return ConstructKeys.constructKey(encodedKey, wrappedKeyAlgorithm,
- wrappedKeyType);
- }
-}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
index d5389ac40ac..86ea35c8b01 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -260,7 +260,7 @@ final class PBES1Core {
if (algo.equals("DES")) {
// P || S (password concatenated with salt)
- byte[] concat = new byte[passwdBytes.length + salt.length];
+ byte[] concat = new byte[Math.addExact(passwdBytes.length, salt.length)];
System.arraycopy(passwdBytes, 0, concat, 0, passwdBytes.length);
java.util.Arrays.fill(passwdBytes, (byte)0x00);
System.arraycopy(salt, 0, concat, passwdBytes.length, salt.length);
@@ -284,7 +284,7 @@ final class PBES1Core {
for (i=0; i<2; i++) {
byte tmp = salt[i];
salt[i] = salt[3-i];
- salt[3-1] = tmp;
+ salt[3-i] = tmp;
}
}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
index ef6190e980b..191d7308eba 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package com.sun.crypto.provider;
import javax.crypto.ShortBufferException;
+import java.util.Arrays;
/**
* This class implements padding as specified in the PKCS#5 standard.
@@ -63,14 +64,13 @@ final class PKCS5Padding implements Padding {
if (in == null)
return;
- if ((off + len) > in.length) {
+ int idx = Math.addExact(off, len);
+ if (idx > in.length) {
throw new ShortBufferException("Buffer too small to hold padding");
}
byte paddingOctet = (byte) (len & 0xff);
- for (int i = 0; i < len; i++) {
- in[i + off] = paddingOctet;
- }
+ Arrays.fill(in, off, idx, paddingOctet);
return;
}
@@ -92,25 +92,24 @@ final class PKCS5Padding implements Padding {
(len == 0)) { // this can happen if input is really a padded buffer
return 0;
}
-
- byte lastByte = in[off + len - 1];
+ int idx = Math.addExact(off, len);
+ byte lastByte = in[idx - 1];
int padValue = (int)lastByte & 0x0ff;
if ((padValue < 0x01)
|| (padValue > blockSize)) {
return -1;
}
- int start = off + len - ((int)lastByte & 0x0ff);
+ int start = idx - padValue;
if (start < off) {
return -1;
}
- for (int i = 0; i < ((int)lastByte & 0x0ff); i++) {
- if (in[start+i] != lastByte) {
+ for (int i = start; i < idx; i++) {
+ if (in[i] != lastByte) {
return -1;
}
}
-
return start;
}
diff --git a/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
index fc9f7ce861b..eb7c11b21f9 100644
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
@@ -38,6 +38,7 @@ package com.sun.net.ssl.internal.www.protocol.https;
import java.net.URL;
import java.net.Proxy;
import java.net.ProtocolException;
+import java.net.MalformedURLException;
import java.io.*;
import java.net.Authenticator;
import javax.net.ssl.*;
@@ -78,10 +79,18 @@ public class HttpsURLConnectionOldImpl
this(u, null, handler);
}
+ static URL checkURL(URL u) throws IOException {
+ if (u != null) {
+ if (u.toExternalForm().indexOf('\n') > -1) {
+ throw new MalformedURLException("Illegal character in URL");
+ }
+ }
+ return u;
+ }
// For both copies of the file, uncomment one line and comment the other
// HttpsURLConnectionImpl(URL u, Handler handler) throws IOException {
HttpsURLConnectionOldImpl(URL u, Proxy p, Handler handler) throws IOException {
- super(u);
+ super(checkURL(u));
delegate = new DelegateHttpsURLConnection(url, p, handler, this);
}
diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java
index 6cc2adb5559..5dfe71907fe 100644
--- a/src/java.base/share/classes/java/io/FileInputStream.java
+++ b/src/java.base/share/classes/java/io/FileInputStream.java
@@ -385,7 +385,8 @@ class FileInputStream extends InputStream
synchronized (this) {
fc = this.channel;
if (fc == null) {
- this.channel = fc = FileChannelImpl.open(fd, path, true, false, this);
+ this.channel = fc = FileChannelImpl.open(fd, path, true,
+ false, false, this);
if (closed) {
try {
// possible race with close(), benign since
diff --git a/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java
index 00d9f82c2dc..f9c1baa3518 100644
--- a/src/java.base/share/classes/java/io/FileOutputStream.java
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java
@@ -410,7 +410,8 @@ class FileOutputStream extends OutputStream
synchronized (this) {
fc = this.channel;
if (fc == null) {
- this.channel = fc = FileChannelImpl.open(fd, path, false, true, this);
+ this.channel = fc = FileChannelImpl.open(fd, path, false,
+ true, false, this);
if (closed) {
try {
// possible race with close(), benign since
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index bffc5a81ee8..359305d8d81 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -44,7 +44,6 @@ import java.util.concurrent.ConcurrentMap;
import static java.io.ObjectStreamClass.processQueue;
-import jdk.internal.misc.ObjectStreamClassValidator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.Unsafe;
import sun.reflect.misc.ReflectUtil;
@@ -1282,6 +1281,33 @@ public class ObjectInputStream
}
}
+ /**
+ * Checks the given array type and length to ensure that creation of such
+ * an array is permitted by this ObjectInputStream. The arrayType argument
+ * must represent an actual array type.
+ *
+ * This private method is called via SharedSecrets.
+ *
+ * @param arrayType the array type
+ * @param arrayLength the array length
+ * @throws NullPointerException if arrayType is null
+ * @throws IllegalArgumentException if arrayType isn't actually an array type
+ * @throws NegativeArraySizeException if arrayLength is negative
+ * @throws InvalidClassException if the filter rejects creation
+ */
+ private void checkArray(Class arrayType, int arrayLength) throws InvalidClassException {
+ Objects.requireNonNull(arrayType);
+ if (! arrayType.isArray()) {
+ throw new IllegalArgumentException("not an array type");
+ }
+
+ if (arrayLength < 0) {
+ throw new NegativeArraySizeException();
+ }
+
+ filterCheck(arrayType, arrayLength);
+ }
+
/**
* Provide access to the persistent fields read from the input stream.
*/
@@ -1740,9 +1766,6 @@ public class ObjectInputStream
throw new StreamCorruptedException(
String.format("invalid type code: %02X", tc));
}
- if (descriptor != null) {
- validateDescriptor(descriptor);
- }
return descriptor;
}
@@ -1770,6 +1793,10 @@ public class ObjectInputStream
passHandle = NULL_HANDLE;
int numIfaces = bin.readInt();
+ if (numIfaces > 65535) {
+ throw new InvalidObjectException("interface limit exceeded: "
+ + numIfaces);
+ }
String[] ifaces = new String[numIfaces];
for (int i = 0; i < numIfaces; i++) {
ifaces[i] = bin.readUTF();
@@ -3978,20 +4005,8 @@ public class ObjectInputStream
}
}
- private void validateDescriptor(ObjectStreamClass descriptor) {
- ObjectStreamClassValidator validating = validator;
- if (validating != null) {
- validating.validateDescriptor(descriptor);
- }
- }
-
- // controlled access to ObjectStreamClassValidator
- private volatile ObjectStreamClassValidator validator;
-
- private static void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
- ois.validator = validator;
- }
static {
- SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::setValidator);
+ SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::checkArray);
}
+
}
diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java
index e5a323830ee..ebca26e2761 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java
@@ -32,14 +32,19 @@ import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
+import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.security.PermissionCollection;
+import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -53,7 +58,8 @@ import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
import jdk.internal.reflect.ReflectionFactory;
import sun.reflect.misc.ReflectUtil;
-
+import jdk.internal.misc.SharedSecrets;
+import jdk.internal.misc.JavaSecurityAccess;
import static java.io.ObjectStreamField.*;
/**
@@ -176,6 +182,9 @@ public class ObjectStreamClass implements Serializable {
/** serialization-appropriate constructor, or null if none */
private Constructor cons;
+ /** protection domains that need to be checked when calling the constructor */
+ private ProtectionDomain[] domains;
+
/** class-defined writeObject method, or null if none */
private Method writeObjectMethod;
/** class-defined readObject method, or null if none */
@@ -508,6 +517,7 @@ public class ObjectStreamClass implements Serializable {
cl, "readObjectNoData", null, Void.TYPE);
hasWriteObjectData = (writeObjectMethod != null);
}
+ domains = getProtectionDomains(cons, cl);
writeReplaceMethod = getInheritableMethod(
cl, "writeReplace", null, Object.class);
readResolveMethod = getInheritableMethod(
@@ -550,6 +560,65 @@ public class ObjectStreamClass implements Serializable {
ObjectStreamClass() {
}
+ /**
+ * Creates a PermissionDomain that grants no permission.
+ */
+ private ProtectionDomain noPermissionsDomain() {
+ PermissionCollection perms = new Permissions();
+ perms.setReadOnly();
+ return new ProtectionDomain(null, perms);
+ }
+
+ /**
+ * Aggregate the ProtectionDomains of all the classes that separate
+ * a concrete class {@code cl} from its ancestor's class declaring
+ * a constructor {@code cons}.
+ *
+ * If {@code cl} is defined by the boot loader, or the constructor
+ * {@code cons} is declared by {@code cl}, or if there is no security
+ * manager, then this method does nothing and {@code null} is returned.
+ *
+ * @param cons A constructor declared by {@code cl} or one of its
+ * ancestors.
+ * @param cl A concrete class, which is either the class declaring
+ * the constructor {@code cons}, or a serializable subclass
+ * of that class.
+ * @return An array of ProtectionDomain representing the set of
+ * ProtectionDomain that separate the concrete class {@code cl}
+ * from its ancestor's declaring {@code cons}, or {@code null}.
+ */
+ private ProtectionDomain[] getProtectionDomains(Constructor cons,
+ Class cl) {
+ ProtectionDomain[] domains = null;
+ if (cons != null && cl.getClassLoader() != null
+ && System.getSecurityManager() != null) {
+ Class cls = cl;
+ Class fnscl = cons.getDeclaringClass();
+ Set pds = null;
+ while (cls != fnscl) {
+ ProtectionDomain pd = cls.getProtectionDomain();
+ if (pd != null) {
+ if (pds == null) pds = new HashSet<>();
+ pds.add(pd);
+ }
+ cls = cls.getSuperclass();
+ if (cls == null) {
+ // that's not supposed to happen
+ // make a ProtectionDomain with no permission.
+ // should we throw instead?
+ if (pds == null) pds = new HashSet<>();
+ else pds.clear();
+ pds.add(noPermissionsDomain());
+ break;
+ }
+ }
+ if (pds != null) {
+ domains = pds.toArray(new ProtectionDomain[0]);
+ }
+ }
+ return domains;
+ }
+
/**
* Initializes class descriptor representing a proxy class.
*/
@@ -580,6 +649,7 @@ public class ObjectStreamClass implements Serializable {
writeReplaceMethod = localDesc.writeReplaceMethod;
readResolveMethod = localDesc.readResolveMethod;
deserializeEx = localDesc.deserializeEx;
+ domains = localDesc.domains;
cons = localDesc.cons;
}
fieldRefl = getReflector(fields, localDesc);
@@ -666,6 +736,7 @@ public class ObjectStreamClass implements Serializable {
if (deserializeEx == null) {
deserializeEx = localDesc.deserializeEx;
}
+ domains = localDesc.domains;
cons = localDesc.cons;
}
@@ -1006,7 +1077,35 @@ public class ObjectStreamClass implements Serializable {
requireInitialized();
if (cons != null) {
try {
- return cons.newInstance();
+ if (domains == null || domains.length == 0) {
+ return cons.newInstance();
+ } else {
+ JavaSecurityAccess jsa = SharedSecrets.getJavaSecurityAccess();
+ PrivilegedAction pea = () -> {
+ try {
+ return cons.newInstance();
+ } catch (InstantiationException
+ | InvocationTargetException
+ | IllegalAccessException x) {
+ throw new UndeclaredThrowableException(x);
+ }
+ }; // Can't use PrivilegedExceptionAction with jsa
+ try {
+ return jsa.doIntersectionPrivilege(pea,
+ AccessController.getContext(),
+ new AccessControlContext(domains));
+ } catch (UndeclaredThrowableException x) {
+ Throwable cause = x.getCause();
+ if (cause instanceof InstantiationException)
+ throw (InstantiationException) cause;
+ if (cause instanceof InvocationTargetException)
+ throw (InvocationTargetException) cause;
+ if (cause instanceof IllegalAccessException)
+ throw (IllegalAccessException) cause;
+ // not supposed to happen
+ throw x;
+ }
+ }
} catch (IllegalAccessException ex) {
// should not occur, as access checks have been suppressed
throw new InternalError(ex);
diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java
index 53c041a5830..5c946d1d715 100644
--- a/src/java.base/share/classes/java/io/RandomAccessFile.java
+++ b/src/java.base/share/classes/java/io/RandomAccessFile.java
@@ -298,7 +298,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
synchronized (this) {
fc = this.channel;
if (fc == null) {
- this.channel = fc = FileChannelImpl.open(fd, path, true, rw, this);
+ this.channel = fc = FileChannelImpl.open(fd, path, true,
+ rw, false, this);
if (closed.get()) {
try {
fc.close();
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index a949b558bff..9a60f55ea48 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -2166,7 +2166,7 @@ public abstract class ClassLoader {
* @spec JPMS
*
* @jvms 5.3 Run-time package
- * @see
+ * @see
* The JAR File Specification: Package Sealing
*/
protected Package definePackage(String name, String specTitle,
diff --git a/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java
index 03740212f9f..d1ba1ef0a8e 100644
--- a/src/java.base/share/classes/java/lang/Package.java
+++ b/src/java.base/share/classes/java/lang/Package.java
@@ -109,7 +109,7 @@ import jdk.internal.reflect.Reflection;
* and have no specification and implementation versioning information.
*
* @jvms 5.3 Run-time package
- * @see
+ * @see
* The JAR File Specification: Package Sealing
* @see ClassLoader#definePackage(String, String, String, String, String, String, String, URL)
*
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 4d30846bfa3..db55267ee83 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -2664,6 +2664,7 @@ public final class String
* point is passed through uninterpreted.
*
* @return an IntStream of char values from this sequence
+ * @since 9
*/
@Override
public IntStream chars() {
@@ -2683,6 +2684,7 @@ public final class String
* {@code int} values which are then passed to the stream.
*
* @return an IntStream of Unicode code points from this sequence
+ * @since 9
*/
@Override
public IntStream codePoints() {
diff --git a/src/java.base/share/classes/java/lang/WeakPairMap.java b/src/java.base/share/classes/java/lang/WeakPairMap.java
index 1e4e12767b3..0e521dc901a 100644
--- a/src/java.base/share/classes/java/lang/WeakPairMap.java
+++ b/src/java.base/share/classes/java/lang/WeakPairMap.java
@@ -88,7 +88,7 @@ final class WeakPairMap {
* Maps the specified key pair to the specified value in this WeakPairMap.
* Neither the keys nor the value can be null.
* The value can be retrieved by calling the {@link #get} method
- * with the the same keys (compared by identity).
+ * with the same keys (compared by identity).
*
* @param k1 the 1st of the pair of keys with which the specified value is to
* be associated
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 348a15921f0..bf3b30443a6 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1196,7 +1196,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
static
MethodHandle bindCaller(MethodHandle mh, Class hostClass) {
- // Code in the the boot layer should now be careful while creating method handles or
+ // Code in the boot layer should now be careful while creating method handles or
// functional interface instances created from method references to @CallerSensitive methods,
// it needs to be ensured the handles or interface instances are kept safe and are not passed
// from the boot layer to untrusted code.
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index de811921c7a..4bc58803c90 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -195,7 +195,7 @@ public final class StringConcatFactory {
// In case we need to double-back onto the StringConcatFactory during this
// static initialization, make sure we have the reasonable defaults to complete
// the static initialization properly. After that, actual users would use the
- // the proper values we have read from the the properties.
+ // the proper values we have read from the properties.
STRATEGY = DEFAULT_STRATEGY;
// CACHE_ENABLE = false; // implied
// CACHE = null; // implied
@@ -398,8 +398,8 @@ public final class StringConcatFactory {
*
Then the following linkage invariants must hold:
*
*
- * The parameter count in {@code concatType} is less than or equal to 200
- *
+ * The number of parameter slots in {@code concatType} is
+ * less than or equal to 200
* The return type in {@code concatType} is assignable from {@link java.lang.String}
*
*
@@ -487,8 +487,8 @@ public final class StringConcatFactory {
* Then the following linkage invariants must hold:
*
*
- * The parameter count in {@code concatType} is less than or equal to
- * 200
+ * The number of parameter slots in {@code concatType} is less than
+ * or equal to 200
*
* The parameter count in {@code concatType} equals to number of \1 tags
* in {@code recipe}
@@ -613,9 +613,9 @@ public final class StringConcatFactory {
concatType.returnType());
}
- if (concatType.parameterCount() > MAX_INDY_CONCAT_ARG_SLOTS) {
+ if (concatType.parameterSlotCount() > MAX_INDY_CONCAT_ARG_SLOTS) {
throw new StringConcatException("Too many concat argument slots: " +
- concatType.parameterCount() +
+ concatType.parameterSlotCount() +
", can only accept " +
MAX_INDY_CONCAT_ARG_SLOTS);
}
diff --git a/src/java.base/share/classes/java/nio/file/FileStore.java b/src/java.base/share/classes/java/nio/file/FileStore.java
index ad94cc90040..06d4f115bb9 100644
--- a/src/java.base/share/classes/java/nio/file/FileStore.java
+++ b/src/java.base/share/classes/java/nio/file/FileStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,6 +111,31 @@ public abstract class FileStore {
*/
public abstract long getUsableSpace() throws IOException;
+ /**
+ * Returns the number of bytes per block in this file store.
+ *
+ * File storage is typically organized into discrete sequences of bytes
+ * called blocks . A block is the smallest storage unit of a file store.
+ * Every read and write operation is performed on a multiple of blocks.
+ *
+ * @implSpec The implementation in this class throws an
+ * {@code UnsupportedOperationException}.
+ *
+ * @return a positive value representing the block size of this file store,
+ * in bytes
+ *
+ * @throws IOException
+ * if an I/O error occurs
+ *
+ * @throws UnsupportedOperationException
+ * if the operation is not supported
+ *
+ * @since 10
+ */
+ public long getBlockSize() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
/**
* Returns the number of unallocated bytes in the file store.
*
diff --git a/src/java.base/share/classes/java/security/CodeSource.java b/src/java.base/share/classes/java/security/CodeSource.java
index 818716fa392..a1f98eeb557 100644
--- a/src/java.base/share/classes/java/security/CodeSource.java
+++ b/src/java.base/share/classes/java/security/CodeSource.java
@@ -35,6 +35,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.cert.*;
import sun.net.util.URLUtil;
+import sun.security.util.IOUtils;
/**
*
@@ -571,6 +572,8 @@ public class CodeSource implements java.io.Serializable {
// could all be present in the stream at the same time
cfs = new Hashtable<>(3);
certList = new ArrayList<>(size > 20 ? 20 : size);
+ } else if (size < 0) {
+ throw new IOException("size cannot be negative");
}
for (int i = 0; i < size; i++) {
@@ -592,13 +595,7 @@ public class CodeSource implements java.io.Serializable {
cfs.put(certType, cf);
}
// parse the certificate
- byte[] encoded = null;
- try {
- encoded = new byte[ois.readInt()];
- } catch (OutOfMemoryError oome) {
- throw new IOException("Certificate too big");
- }
- ois.readFully(encoded);
+ byte[] encoded = IOUtils.readNBytes(ois, ois.readInt());
ByteArrayInputStream bais = new ByteArrayInputStream(encoded);
try {
certList.add(cf.generateCertificate(bais));
diff --git a/src/java.base/share/classes/java/security/UnresolvedPermission.java b/src/java.base/share/classes/java/security/UnresolvedPermission.java
index b5dc02dcb38..d75c24cbf7e 100644
--- a/src/java.base/share/classes/java/security/UnresolvedPermission.java
+++ b/src/java.base/share/classes/java/security/UnresolvedPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,16 @@
package java.security;
+import sun.security.util.IOUtils;
+
import java.io.IOException;
import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Hashtable;
import java.lang.reflect.*;
import java.security.cert.*;
+import java.util.List;
/**
* The UnresolvedPermission class is used to hold Permissions that
@@ -550,6 +554,7 @@ implements java.io.Serializable
{
CertificateFactory cf;
Hashtable cfs = null;
+ List certList = null;
ois.defaultReadObject();
@@ -562,7 +567,9 @@ implements java.io.Serializable
// we know of 3 different cert types: X.509, PGP, SDSI, which
// could all be present in the stream at the same time
cfs = new Hashtable<>(3);
- this.certs = new java.security.cert.Certificate[size];
+ certList = new ArrayList<>(size > 20 ? 20 : size);
+ } else if (size < 0) {
+ throw new IOException("size cannot be negative");
}
for (int i=0; i(size);
+ extensions = new HashMap<>(size > 20 ? 20 : size);
}
// Read in the extensions and put the mappings in the extensions map
for (int i = 0; i < size; i++) {
String oid = (String) ois.readObject();
boolean critical = ois.readBoolean();
- int length = ois.readInt();
- byte[] extVal = new byte[length];
- ois.readFully(extVal);
+ byte[] extVal = IOUtils.readNBytes(ois, ois.readInt());
Extension ext = sun.security.x509.Extension.newExtension
(new ObjectIdentifier(oid), critical, extVal);
extensions.put(oid, ext);
diff --git a/src/java.base/share/classes/java/util/ArrayDeque.java b/src/java.base/share/classes/java/util/ArrayDeque.java
index f900f10fb25..47488806283 100644
--- a/src/java.base/share/classes/java/util/ArrayDeque.java
+++ b/src/java.base/share/classes/java/util/ArrayDeque.java
@@ -38,6 +38,7 @@ import java.io.Serializable;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import jdk.internal.misc.SharedSecrets;
/**
* Resizable-array implementation of the {@link Deque} interface. Array
@@ -1194,6 +1195,7 @@ public class ArrayDeque extends AbstractCollection
// Read in size and allocate array
int size = s.readInt();
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size + 1);
elements = new Object[size + 1];
this.tail = size;
diff --git a/src/java.base/share/classes/java/util/ArrayList.java b/src/java.base/share/classes/java/util/ArrayList.java
index e3ff8049cac..53d2a05f61b 100644
--- a/src/java.base/share/classes/java/util/ArrayList.java
+++ b/src/java.base/share/classes/java/util/ArrayList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package java.util;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import jdk.internal.misc.SharedSecrets;
/**
* Resizable-array implementation of the {@code List} interface. Implements
@@ -814,6 +815,7 @@ public class ArrayList extends AbstractList
if (size > 0) {
// like clone(), allocate array based upon size not capacity
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
Object[] elements = new Object[size];
// Read in all elements in the proper order.
diff --git a/src/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java
index 4534656cd97..5a87c5820cc 100644
--- a/src/java.base/share/classes/java/util/HashMap.java
+++ b/src/java.base/share/classes/java/util/HashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
+import jdk.internal.misc.SharedSecrets;
/**
* Hash table based implementation of the {@code Map} interface. This
@@ -1448,6 +1449,10 @@ public class HashMap extends AbstractMap
float ft = (float)cap * lf;
threshold = ((cap < MAXIMUM_CAPACITY && ft < MAXIMUM_CAPACITY) ?
(int)ft : Integer.MAX_VALUE);
+
+ // Check Map.Entry[].class since it's the nearest public type to
+ // what we're actually creating.
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, cap);
@SuppressWarnings({"rawtypes","unchecked"})
Node[] tab = (Node[])new Node[cap];
table = tab;
diff --git a/src/java.base/share/classes/java/util/HashSet.java b/src/java.base/share/classes/java/util/HashSet.java
index 360de8119d6..ec47b914b66 100644
--- a/src/java.base/share/classes/java/util/HashSet.java
+++ b/src/java.base/share/classes/java/util/HashSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package java.util;
import java.io.InvalidObjectException;
+import jdk.internal.misc.SharedSecrets;
/**
* This class implements the {@code Set} interface, backed by a hash table
@@ -322,6 +323,13 @@ public class HashSet
capacity = (int) Math.min(size * Math.min(1 / loadFactor, 4.0f),
HashMap.MAXIMUM_CAPACITY);
+ // Constructing the backing map will lazily create an array when the first element is
+ // added, so check it before construction. Call HashMap.tableSizeFor to compute the
+ // actual allocation size. Check Map.Entry[].class since it's the nearest public type to
+ // what is actually created.
+ SharedSecrets.getJavaObjectInputStreamAccess()
+ .checkArray(s, Map.Entry[].class, HashMap.tableSizeFor(capacity));
+
// Create backing HashMap
map = (((HashSet)this) instanceof LinkedHashSet ?
new LinkedHashMap<>(capacity, loadFactor) :
diff --git a/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java
index f97303be2b3..77f0facc511 100644
--- a/src/java.base/share/classes/java/util/Hashtable.java
+++ b/src/java.base/share/classes/java/util/Hashtable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.io.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.BiFunction;
+import jdk.internal.misc.SharedSecrets;
/**
* This class implements a hash table, which maps keys to values. Any
@@ -1291,6 +1292,10 @@ public class Hashtable
if (length > elements && (length & 1) == 0)
length--;
length = Math.min(length, origlength);
+
+ // Check Map.Entry[].class since it's the nearest public type to
+ // what we're actually creating.
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, length);
table = new Entry[length];
threshold = (int)Math.min(length * loadFactor, MAX_ARRAY_SIZE + 1);
count = 0;
diff --git a/src/java.base/share/classes/java/util/IdentityHashMap.java b/src/java.base/share/classes/java/util/IdentityHashMap.java
index f749774e78e..e48cb354c6e 100644
--- a/src/java.base/share/classes/java/util/IdentityHashMap.java
+++ b/src/java.base/share/classes/java/util/IdentityHashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.lang.reflect.Array;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
+import jdk.internal.misc.SharedSecrets;
/**
* This class implements the {@code Map} interface with a hash table, using
@@ -1304,7 +1305,9 @@ public class IdentityHashMap
if (size < 0)
throw new java.io.StreamCorruptedException
("Illegal mappings count: " + size);
- init(capacity(size));
+ int cap = capacity(size);
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, cap);
+ init(cap);
// Read the keys and values, and put the mappings in the table
for (int i=0; i
* language (script, country, variant) extends AbstractQueue
// Read in (and discard) array length
s.readInt();
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
queue = new Object[size];
// Read in all elements.
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index 1ade481e7d1..fd7ee9ce6b3 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -42,6 +42,7 @@ import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Function;
+import jdk.internal.misc.SharedSecrets;
import jdk.internal.util.xml.PropertiesDefaultHandler;
/**
@@ -1441,6 +1442,16 @@ class Properties extends Hashtable {
throw new StreamCorruptedException("Illegal # of Elements: " + elements);
}
+ // Constructing the backing map will lazily create an array when the first element is
+ // added, so check it before construction. Note that CHM's constructor takes a size
+ // that is the number of elements to be stored -- not the table size -- so it must be
+ // inflated by the default load factor of 0.75, then inflated to the next power of two.
+ // (CHM uses the same power-of-two computation as HashMap, and HashMap.tableSizeFor is
+ // accessible here.) Check Map.Entry[].class since it's the nearest public type to
+ // what is actually created.
+ SharedSecrets.getJavaObjectInputStreamAccess()
+ .checkArray(s, Map.Entry[].class, HashMap.tableSizeFor((int)(elements / 0.75)));
+
// create CHM of appropriate capacity
map = new ConcurrentHashMap<>(elements);
diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java
index 75d1157c74a..1f2e0e82f8e 100644
--- a/src/java.base/share/classes/java/util/ServiceLoader.java
+++ b/src/java.base/share/classes/java/util/ServiceLoader.java
@@ -1409,7 +1409,7 @@ public final class ServiceLoader
*
* To achieve laziness the actual work of locating providers is done
* when processing the stream. If a service provider cannot be loaded for any
- * of the the reasons specified in the Errors section
+ * of the reasons specified in the Errors section
* above then {@link ServiceConfigurationError} is thrown by whatever method
* caused the service provider to be loaded.
*
diff --git a/src/java.base/share/classes/java/util/SimpleTimeZone.java b/src/java.base/share/classes/java/util/SimpleTimeZone.java
index d7555a0db0c..7ed6e71753f 100644
--- a/src/java.base/share/classes/java/util/SimpleTimeZone.java
+++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ package java.util;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
+import java.io.InvalidObjectException;
import sun.util.calendar.CalendarSystem;
import sun.util.calendar.CalendarUtils;
import sun.util.calendar.BaseCalendar;
@@ -1278,6 +1279,9 @@ public class SimpleTimeZone extends TimeZone {
*/
private int serialVersionOnStream = currentSerialVersion;
+ // Maximum number of rules.
+ private static final int MAX_RULE_NUM = 6;
+
private synchronized void invalidateCache() {
cacheYear = startYear - 1;
cacheStart = cacheEnd = 0;
@@ -1569,7 +1573,7 @@ public class SimpleTimeZone extends TimeZone {
*/
private byte[] packRules()
{
- byte[] rules = new byte[6];
+ byte[] rules = new byte[MAX_RULE_NUM];
rules[0] = (byte)startDay;
rules[1] = (byte)startDayOfWeek;
rules[2] = (byte)endDay;
@@ -1594,7 +1598,7 @@ public class SimpleTimeZone extends TimeZone {
endDayOfWeek = rules[3];
// As of serial version 2, include time modes
- if (rules.length >= 6) {
+ if (rules.length >= MAX_RULE_NUM) {
startTimeMode = rules[4];
endTimeMode = rules[5];
}
@@ -1691,9 +1695,13 @@ public class SimpleTimeZone extends TimeZone {
// store the actual rules (which have not be made compatible with 1.1)
// in the optional area. Read them in here and parse them.
int length = stream.readInt();
- byte[] rules = new byte[length];
- stream.readFully(rules);
- unpackRules(rules);
+ if (length <= MAX_RULE_NUM) {
+ byte[] rules = new byte[length];
+ stream.readFully(rules);
+ unpackRules(rules);
+ } else {
+ throw new InvalidObjectException("Too many rules: " + length);
+ }
}
if (serialVersionOnStream >= 2) {
diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
index 592f9a51cd2..ad66f47e277 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -51,6 +51,7 @@ import java.util.Spliterators;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import jdk.internal.misc.SharedSecrets;
/**
* A thread-safe variant of {@link java.util.ArrayList} in which all mutative
@@ -933,6 +934,7 @@ public class CopyOnWriteArrayList
// Read in array length and allocate array
int len = s.readInt();
+ SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, len);
Object[] elements = new Object[len];
// Read in all elements in the proper order.
diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java
index b288d1ed268..561c4a7b4fc 100644
--- a/src/java.base/share/classes/java/util/jar/Attributes.java
+++ b/src/java.base/share/classes/java/util/jar/Attributes.java
@@ -568,7 +568,7 @@ public class Attributes implements Map, Cloneable {
/**
* {@code Name} object for {@code Sealed} manifest attribute
* used for sealing.
- * @see
+ * @see
* Package Sealing
*/
public static final Name SEALED = new Name("Sealed");
diff --git a/src/java.base/share/classes/javax/security/auth/Policy.java b/src/java.base/share/classes/javax/security/auth/Policy.java
index cc153b59f05..f95732c4840 100644
--- a/src/java.base/share/classes/javax/security/auth/Policy.java
+++ b/src/java.base/share/classes/javax/security/auth/Policy.java
@@ -134,7 +134,7 @@ import sun.security.util.Debug;
* setting the value of the {@code auth.policy.provider} security property to
* the fully qualified name of the desired {@code Policy} implementation class.
*
- * @deprecated as of JDK version 1.4 -- Replaced by java.security.Policy.
+ * @deprecated Replaced by java.security.Policy.
* java.security.Policy has a method:
*
* public PermissionCollection getPermissions
@@ -152,11 +152,12 @@ import sun.security.util.Debug;
*
* These two APIs provide callers the means to query the
* Policy for Principal-based Permission entries.
+ * This class is subject to removal in a future version of Java SE.
*
* @since 1.4
* @see java.security.Security security properties
*/
-@Deprecated(since="1.4")
+@Deprecated(since="1.4", forRemoval=true)
public abstract class Policy {
private static Policy policy;
diff --git a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
index b80cec126a5..97ace14095d 100644
--- a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
+++ b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
@@ -29,7 +29,6 @@ import java.security.AccessController;
import java.security.Permission;
import java.security.Permissions;
import java.security.PermissionCollection;
-import java.security.Policy;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
@@ -57,7 +56,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
sun.security.util.Debug.getInstance("combiner",
"\t[SubjectDomainCombiner]");
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({"deprecation", "removal"})
// Note: check only at classloading time, not dynamically during combine()
private static final boolean useJavaxPolicy =
javax.security.auth.Policy.isCustomPolicySet(debug);
@@ -303,7 +302,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
if (!allowCaching) {
java.security.AccessController.doPrivileged
(new PrivilegedAction() {
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({"deprecation", "removal"})
public Void run() {
// Call refresh only caching is disallowed
javax.security.auth.Policy.getPolicy().refresh();
@@ -374,7 +373,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
PermissionCollection newPerms =
java.security.AccessController.doPrivileged
(new PrivilegedAction() {
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({"deprecation", "removal"})
public PermissionCollection run() {
return
javax.security.auth.Policy.getPolicy().getPermissions
diff --git a/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
index c344f8adc7c..4c734670da7 100644
--- a/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
+++ b/src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,14 @@
package jdk.internal.misc;
+import java.io.InvalidClassException;
import java.io.ObjectInputStream;
/**
- * The interface to specify methods for accessing {@code ObjectInputStream}
- * @author sjiang
+ * Interface to specify methods for accessing {@code ObjectInputStream}.
*/
+@FunctionalInterface
public interface JavaObjectInputStreamAccess {
- /**
- * Sets a descriptor validating.
- * @param ois stream to have the descriptors validated
- * @param validator validator used to validate a descriptor.
- */
- public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator);
+ void checkArray(ObjectInputStream ois, Class arrayType, int arrayLength)
+ throws InvalidClassException;
}
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index df580eaf9c7..856ee4c23b8 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -66,7 +66,7 @@ import jdk.internal.perf.PerfCounter;
* -m and --add-modules options. The modules are located on a module path that
* is constructed from the upgrade module path, system modules, and application
* module path. The Configuration is instantiated as the boot layer with each
- * module in the the configuration defined to a class loader.
+ * module in the configuration defined to a class loader.
*/
public final class ModuleBootstrap {
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
index 804f5eb4527..1f9d94ca1d9 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
@@ -74,7 +74,7 @@ public class ModuleHashesBuilder {
* the outgoing edges from M to non-candidate modules.
*/
public Map computeHashes(Set roots) {
- // build a graph containing the the packaged modules and
+ // build a graph containing the packaged modules and
// its transitive dependences matching --hash-modules
Graph.Builder builder = new Graph.Builder<>();
Deque deque = new ArrayDeque<>(configuration.modules());
diff --git a/src/java.base/share/classes/jdk/internal/module/Resources.java b/src/java.base/share/classes/jdk/internal/module/Resources.java
index 53865742dbe..d224d1aba84 100644
--- a/src/java.base/share/classes/jdk/internal/module/Resources.java
+++ b/src/java.base/share/classes/jdk/internal/module/Resources.java
@@ -56,7 +56,7 @@ public final class Resources {
/**
* Derive a package name for a resource. The package name
* returned by this method may not be a legal package name. This method
- * returns null if the the resource name ends with a "/" (a directory)
+ * returns null if the resource name ends with a "/" (a directory)
* or the resource name does not contain a "/".
*/
public static String toPackageName(String name) {
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
index 811b74c7242..bb7ff8f5147 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
@@ -192,7 +192,7 @@ final class Frame {
private static final int LOCAL = 0x2000000;
/**
- * Kind of the the types that are relative to the stack of an input stack
+ * Kind of the types that are relative to the stack of an input stack
* map frame. The value of such types is a position relatively to the top of
* this stack.
*/
diff --git a/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java b/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
index 7180884ec69..21994bde722 100644
--- a/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
+++ b/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
@@ -115,8 +115,8 @@ public class FtpClient extends sun.net.ftp.FtpClient {
new PrivilegedAction() {
public Object run() {
- vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 0).intValue();
- vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 0).intValue();
+ vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 300_000).intValue();
+ vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 300_000).intValue();
encs[0] = System.getProperty("file.encoding", "ISO8859_1");
return null;
}
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 5e23b043a69..17e158541cc 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -843,18 +843,36 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
this(u, null, handler);
}
- public HttpURLConnection(URL u, String host, int port) {
- this(u, new Proxy(Proxy.Type.HTTP, InetSocketAddress.createUnresolved(host, port)));
+ private static String checkHost(String h) throws IOException {
+ if (h != null) {
+ if (h.indexOf('\n') > -1) {
+ throw new MalformedURLException("Illegal character in host");
+ }
+ }
+ return h;
+ }
+ public HttpURLConnection(URL u, String host, int port) throws IOException {
+ this(u, new Proxy(Proxy.Type.HTTP,
+ InetSocketAddress.createUnresolved(checkHost(host), port)));
}
/** this constructor is used by other protocol handlers such as ftp
that want to use http to fetch urls on their behalf.*/
- public HttpURLConnection(URL u, Proxy p) {
+ public HttpURLConnection(URL u, Proxy p) throws IOException {
this(u, p, new Handler());
}
- protected HttpURLConnection(URL u, Proxy p, Handler handler) {
- super(u);
+ private static URL checkURL(URL u) throws IOException {
+ if (u != null) {
+ if (u.toExternalForm().indexOf('\n') > -1) {
+ throw new MalformedURLException("Illegal character in URL");
+ }
+ }
+ return u;
+ }
+ protected HttpURLConnection(URL u, Proxy p, Handler handler)
+ throws IOException {
+ super(checkURL(u));
requests = new MessageHeader();
responses = new MessageHeader();
userHeaders = new MessageHeader();
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
index 792af78675c..8b49800c78b 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
@@ -38,6 +38,7 @@ package sun.net.www.protocol.https;
import java.net.URL;
import java.net.Proxy;
import java.net.ProtocolException;
+import java.net.MalformedURLException;
import java.io.*;
import java.net.Authenticator;
import javax.net.ssl.*;
@@ -80,10 +81,18 @@ public class HttpsURLConnectionImpl
this(u, null, handler);
}
+ static URL checkURL(URL u) throws IOException {
+ if (u != null) {
+ if (u.toExternalForm().indexOf('\n') > -1) {
+ throw new MalformedURLException("Illegal character in URL");
+ }
+ }
+ return u;
+ }
// For both copies of the file, uncomment one line and comment the other
HttpsURLConnectionImpl(URL u, Proxy p, Handler handler) throws IOException {
// HttpsURLConnectionOldImpl(URL u, Proxy p, Handler handler) throws IOException {
- super(u);
+ super(checkURL(u));
delegate = new DelegateHttpsURLConnection(url, p, handler, this);
}
diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index c741423237d..5e48758bac0 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -41,6 +41,11 @@ import java.nio.channels.OverlappingFileLockException;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.SelectableChannel;
import java.nio.channels.WritableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.FileStore;
+import java.nio.file.FileSystemException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
@@ -87,6 +92,12 @@ public class FileChannelImpl
// Positional-read is not interruptible
private volatile boolean uninterruptible;
+ // DirectIO flag
+ private final boolean direct;
+
+ // IO alignment value for DirectIO
+ private final int alignment;
+
// Cleanable with an action which closes this channel's file descriptor
private final Cleanable closer;
@@ -103,14 +114,22 @@ public class FileChannelImpl
}
private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
- boolean writable, Object parent)
+ boolean writable, boolean direct, Object parent)
{
this.fd = fd;
this.readable = readable;
this.writable = writable;
this.parent = parent;
this.path = path;
+ this.direct = direct;
this.nd = new FileDispatcherImpl();
+ if (direct) {
+ assert path != null;
+ this.alignment = nd.setDirectIO(fd, path);
+ } else {
+ this.alignment = -1;
+ }
+
// Register a cleaning action if and only if there is no parent
// as the parent will take care of closing the file descriptor.
// FileChannel is used by the LambdaMetaFactory so a lambda cannot
@@ -123,9 +142,9 @@ public class FileChannelImpl
// and RandomAccessFile.getChannel()
public static FileChannel open(FileDescriptor fd, String path,
boolean readable, boolean writable,
- Object parent)
+ boolean direct, Object parent)
{
- return new FileChannelImpl(fd, path, readable, writable, parent);
+ return new FileChannelImpl(fd, path, readable, writable, direct, parent);
}
private void ensureOpen() throws IOException {
@@ -181,6 +200,8 @@ public class FileChannelImpl
if (!readable)
throw new NonReadableChannelException();
synchronized (positionLock) {
+ if (direct)
+ Util.checkChannelPositionAligned(position(), alignment);
int n = 0;
int ti = -1;
try {
@@ -189,7 +210,7 @@ public class FileChannelImpl
if (!isOpen())
return 0;
do {
- n = IOUtil.read(fd, dst, -1, nd);
+ n = IOUtil.read(fd, dst, -1, direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
@@ -209,6 +230,8 @@ public class FileChannelImpl
if (!readable)
throw new NonReadableChannelException();
synchronized (positionLock) {
+ if (direct)
+ Util.checkChannelPositionAligned(position(), alignment);
long n = 0;
int ti = -1;
try {
@@ -217,7 +240,8 @@ public class FileChannelImpl
if (!isOpen())
return 0;
do {
- n = IOUtil.read(fd, dsts, offset, length, nd);
+ n = IOUtil.read(fd, dsts, offset, length,
+ direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
@@ -233,6 +257,8 @@ public class FileChannelImpl
if (!writable)
throw new NonWritableChannelException();
synchronized (positionLock) {
+ if (direct)
+ Util.checkChannelPositionAligned(position(), alignment);
int n = 0;
int ti = -1;
try {
@@ -241,7 +267,7 @@ public class FileChannelImpl
if (!isOpen())
return 0;
do {
- n = IOUtil.write(fd, src, -1, nd);
+ n = IOUtil.write(fd, src, -1, direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
@@ -261,6 +287,8 @@ public class FileChannelImpl
if (!writable)
throw new NonWritableChannelException();
synchronized (positionLock) {
+ if (direct)
+ Util.checkChannelPositionAligned(position(), alignment);
long n = 0;
int ti = -1;
try {
@@ -269,7 +297,8 @@ public class FileChannelImpl
if (!isOpen())
return 0;
do {
- n = IOUtil.write(fd, srcs, offset, length, nd);
+ n = IOUtil.write(fd, srcs, offset, length,
+ direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
@@ -752,6 +781,8 @@ public class FileChannelImpl
throw new IllegalArgumentException("Negative position");
if (!readable)
throw new NonReadableChannelException();
+ if (direct)
+ Util.checkChannelPositionAligned(position, alignment);
ensureOpen();
if (nd.needsPositionLock()) {
synchronized (positionLock) {
@@ -774,7 +805,7 @@ public class FileChannelImpl
if (!isOpen())
return -1;
do {
- n = IOUtil.read(fd, dst, position, nd);
+ n = IOUtil.read(fd, dst, position, direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
@@ -791,6 +822,8 @@ public class FileChannelImpl
throw new IllegalArgumentException("Negative position");
if (!writable)
throw new NonWritableChannelException();
+ if (direct)
+ Util.checkChannelPositionAligned(position, alignment);
ensureOpen();
if (nd.needsPositionLock()) {
synchronized (positionLock) {
@@ -811,7 +844,7 @@ public class FileChannelImpl
if (!isOpen())
return -1;
do {
- n = IOUtil.write(fd, src, position, nd);
+ n = IOUtil.write(fd, src, position, direct, alignment, nd);
} while ((n == IOStatus.INTERRUPTED) && isOpen());
return IOStatus.normalize(n);
} finally {
diff --git a/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java b/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java
index b0fd59200c2..3cf74c612a8 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileDispatcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,4 +61,6 @@ abstract class FileDispatcher extends NativeDispatcher {
abstract boolean canTransferToDirectly(SelectableChannel sc);
abstract boolean transferToDirectlyNeedsPositionLock();
+
+ abstract int setDirectIO(FileDescriptor fd, String path);
}
diff --git a/src/java.base/share/classes/sun/nio/ch/IOUtil.java b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
index 91980b16891..d60f3a7a03c 100644
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,22 +47,38 @@ public class IOUtil {
NativeDispatcher nd)
throws IOException
{
- if (src instanceof DirectBuffer)
- return writeFromNativeBuffer(fd, src, position, nd);
+ return write(fd, src, position, false, -1, nd);
+ }
+
+ static int write(FileDescriptor fd, ByteBuffer src, long position,
+ boolean directIO, int alignment, NativeDispatcher nd)
+ throws IOException
+ {
+ if (src instanceof DirectBuffer) {
+ return writeFromNativeBuffer(fd, src, position,
+ directIO, alignment, nd);
+ }
// Substitute a native buffer
int pos = src.position();
int lim = src.limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
- ByteBuffer bb = Util.getTemporaryDirectBuffer(rem);
+ ByteBuffer bb;
+ if (directIO) {
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+ bb = Util.getTemporaryAlignedDirectBuffer(rem, alignment);
+ } else {
+ bb = Util.getTemporaryDirectBuffer(rem);
+ }
try {
bb.put(src);
bb.flip();
// Do not update src until we see how many bytes were written
src.position(pos);
- int n = writeFromNativeBuffer(fd, bb, position, nd);
+ int n = writeFromNativeBuffer(fd, bb, position,
+ directIO, alignment, nd);
if (n > 0) {
// now update src
src.position(pos + n);
@@ -74,7 +90,8 @@ public class IOUtil {
}
private static int writeFromNativeBuffer(FileDescriptor fd, ByteBuffer bb,
- long position, NativeDispatcher nd)
+ long position, boolean directIO,
+ int alignment, NativeDispatcher nd)
throws IOException
{
int pos = bb.position();
@@ -82,6 +99,11 @@ public class IOUtil {
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
+ if (directIO) {
+ Util.checkBufferPositionAligned(bb, pos, alignment);
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+ }
+
int written = 0;
if (rem == 0)
return 0;
@@ -100,12 +122,19 @@ public class IOUtil {
static long write(FileDescriptor fd, ByteBuffer[] bufs, NativeDispatcher nd)
throws IOException
{
- return write(fd, bufs, 0, bufs.length, nd);
+ return write(fd, bufs, 0, bufs.length, false, -1, nd);
}
static long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length,
NativeDispatcher nd)
throws IOException
+ {
+ return write(fd, bufs, offset, length, false, -1, nd);
+ }
+
+ static long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length,
+ boolean directIO, int alignment, NativeDispatcher nd)
+ throws IOException
{
IOVecWrapper vec = IOVecWrapper.get(length);
@@ -122,12 +151,20 @@ public class IOUtil {
int lim = buf.limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
+ if (directIO)
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+
if (rem > 0) {
vec.setBuffer(iov_len, buf, pos, rem);
// allocate shadow buffer to ensure I/O is done with direct buffer
if (!(buf instanceof DirectBuffer)) {
- ByteBuffer shadow = Util.getTemporaryDirectBuffer(rem);
+ ByteBuffer shadow;
+ if (directIO)
+ shadow = Util.getTemporaryAlignedDirectBuffer(rem,
+ alignment);
+ else
+ shadow = Util.getTemporaryDirectBuffer(rem);
shadow.put(buf);
shadow.flip();
vec.setShadow(iov_len, shadow);
@@ -185,16 +222,33 @@ public class IOUtil {
static int read(FileDescriptor fd, ByteBuffer dst, long position,
NativeDispatcher nd)
throws IOException
+ {
+ return read(fd, dst, position, false, -1, nd);
+ }
+
+ static int read(FileDescriptor fd, ByteBuffer dst, long position,
+ boolean directIO, int alignment, NativeDispatcher nd)
+ throws IOException
{
if (dst.isReadOnly())
throw new IllegalArgumentException("Read-only buffer");
if (dst instanceof DirectBuffer)
- return readIntoNativeBuffer(fd, dst, position, nd);
+ return readIntoNativeBuffer(fd, dst, position,
+ directIO, alignment, nd);
// Substitute a native buffer
- ByteBuffer bb = Util.getTemporaryDirectBuffer(dst.remaining());
+ ByteBuffer bb;
+ int rem = dst.remaining();
+ if (directIO) {
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+ bb = Util.getTemporaryAlignedDirectBuffer(rem,
+ alignment);
+ } else {
+ bb = Util.getTemporaryDirectBuffer(rem);
+ }
try {
- int n = readIntoNativeBuffer(fd, bb, position, nd);
+ int n = readIntoNativeBuffer(fd, bb, position,
+ directIO, alignment,nd);
bb.flip();
if (n > 0)
dst.put(bb);
@@ -205,7 +259,8 @@ public class IOUtil {
}
private static int readIntoNativeBuffer(FileDescriptor fd, ByteBuffer bb,
- long position, NativeDispatcher nd)
+ long position, boolean directIO,
+ int alignment, NativeDispatcher nd)
throws IOException
{
int pos = bb.position();
@@ -213,6 +268,11 @@ public class IOUtil {
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
+ if (directIO) {
+ Util.checkBufferPositionAligned(bb, pos, alignment);
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+ }
+
if (rem == 0)
return 0;
int n = 0;
@@ -230,12 +290,19 @@ public class IOUtil {
static long read(FileDescriptor fd, ByteBuffer[] bufs, NativeDispatcher nd)
throws IOException
{
- return read(fd, bufs, 0, bufs.length, nd);
+ return read(fd, bufs, 0, bufs.length, false, -1, nd);
}
static long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length,
NativeDispatcher nd)
throws IOException
+ {
+ return read(fd, bufs, offset, bufs.length, false, -1, nd);
+ }
+
+ static long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length,
+ boolean directIO, int alignment, NativeDispatcher nd)
+ throws IOException
{
IOVecWrapper vec = IOVecWrapper.get(length);
@@ -255,12 +322,21 @@ public class IOUtil {
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
+ if (directIO)
+ Util.checkRemainingBufferSizeAligned(rem, alignment);
+
if (rem > 0) {
vec.setBuffer(iov_len, buf, pos, rem);
// allocate shadow buffer to ensure I/O is done with direct buffer
if (!(buf instanceof DirectBuffer)) {
- ByteBuffer shadow = Util.getTemporaryDirectBuffer(rem);
+ ByteBuffer shadow;
+ if (directIO) {
+ shadow = Util.getTemporaryAlignedDirectBuffer(rem,
+ alignment);
+ } else {
+ shadow = Util.getTemporaryDirectBuffer(rem);
+ }
vec.setShadow(iov_len, shadow);
buf = shadow;
pos = shadow.position();
diff --git a/src/java.base/share/classes/sun/nio/ch/Util.java b/src/java.base/share/classes/sun/nio/ch/Util.java
index ba62bb34de3..e129a1e8cac 100644
--- a/src/java.base/share/classes/sun/nio/ch/Util.java
+++ b/src/java.base/share/classes/sun/nio/ch/Util.java
@@ -37,7 +37,7 @@ import java.util.Iterator;
import java.util.Set;
import jdk.internal.misc.Unsafe;
import sun.security.action.GetPropertyAction;
-
+import java.io.IOException;
public class Util {
@@ -236,6 +236,33 @@ public class Util {
}
}
+ /**
+ * Returns a temporary buffer of at least the given size and
+ * aligned to the alignment
+ */
+ public static ByteBuffer getTemporaryAlignedDirectBuffer(int size,
+ int alignment) {
+ if (isBufferTooLarge(size)) {
+ return ByteBuffer.allocateDirect(size + alignment - 1)
+ .alignedSlice(alignment);
+ }
+
+ BufferCache cache = bufferCache.get();
+ ByteBuffer buf = cache.get(size);
+ if (buf != null) {
+ if (buf.alignmentOffset(0, alignment) == 0) {
+ return buf;
+ }
+ } else {
+ if (!cache.isEmpty()) {
+ buf = cache.removeFirst();
+ free(buf);
+ }
+ }
+ return ByteBuffer.allocateDirect(size + alignment - 1)
+ .alignedSlice(alignment);
+ }
+
/**
* Releases a temporary buffer by returning to the cache or freeing it.
*/
@@ -459,4 +486,37 @@ public class Util {
}
return dbb;
}
+
+ static void checkBufferPositionAligned(ByteBuffer bb,
+ int pos, int alignment)
+ throws IOException
+ {
+ if (bb.alignmentOffset(pos, alignment) != 0) {
+ throw new IOException("Current location of the bytebuffer ("
+ + pos + ") is not a multiple of the block size ("
+ + alignment + ")");
+ }
+ }
+
+ static void checkRemainingBufferSizeAligned(int rem,
+ int alignment)
+ throws IOException
+ {
+ if (rem % alignment != 0) {
+ throw new IOException("Number of remaining bytes ("
+ + rem + ") is not a multiple of the block size ("
+ + alignment + ")");
+ }
+ }
+
+ static void checkChannelPositionAligned(long position,
+ int alignment)
+ throws IOException
+ {
+ if (position % alignment != 0) {
+ throw new IOException("Channel position (" + position
+ + ") is not a multiple of the block size ("
+ + alignment + ")");
+ }
+ }
}
diff --git a/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java b/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
index 71ebffc8320..673c3296696 100644
--- a/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
+++ b/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -137,6 +137,8 @@ public final class ExtendedOptions {
public static final InternalOption FILE_TREE = new InternalOption<>();
+ public static final InternalOption DIRECT = new InternalOption<>();
+
public static final InternalOption SENSITIVITY_HIGH = new InternalOption<>();
public static final InternalOption SENSITIVITY_MEDIUM = new InternalOption<>();
public static final InternalOption SENSITIVITY_LOW = new InternalOption<>();
diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
index a72f79849d5..d2a8d43796b 100644
--- a/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
+++ b/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
@@ -57,21 +57,22 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
public Object invoke(Object proxy, Method method, Object[] args) {
String member = method.getName();
- Class[] paramTypes = method.getParameterTypes();
+ int parameterCount = method.getParameterCount();
// Handle Object and Annotation methods
- if (member.equals("equals") && paramTypes.length == 1 &&
- paramTypes[0] == Object.class)
+ if (parameterCount == 1 && member == "equals" &&
+ method.getParameterTypes()[0] == Object.class) {
return equalsImpl(proxy, args[0]);
- if (paramTypes.length != 0)
+ }
+ if (parameterCount != 0) {
throw new AssertionError("Too many parameters for an annotation method");
+ }
- switch(member) {
- case "toString":
+ if (member == "toString") {
return toStringImpl();
- case "hashCode":
+ } else if (member == "hashCode") {
return hashCodeImpl();
- case "annotationType":
+ } else if (member == "annotationType") {
return type;
}
diff --git a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
index 9c0e0b7dc05..23f8df52e30 100644
--- a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -46,6 +46,7 @@ import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.cert.CertificateException;
import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.InvalidParameterSpecException;
import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.*;
@@ -147,6 +148,11 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
"keystore.PKCS12.keyProtectionAlgorithm"
};
+ private static final int MAX_ITERATION_COUNT = 5000000;
+ private static final int PBE_ITERATION_COUNT = 50000; // default
+ private static final int MAC_ITERATION_COUNT = 100000; // default
+ private static final int SALT_LEN = 20;
+
// friendlyName, localKeyId, trustedKeyUsage
private static final String[] CORE_ATTRIBUTES = {
"1.2.840.113549.1.9.20",
@@ -192,8 +198,6 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
private static ObjectIdentifier[] AnyUsage;
private int counter = 0;
- private static final int iterationCount = 1024;
- private static final int SALT_LEN = 20;
// private key count
// Note: This is a workaround to allow null localKeyID attribute
@@ -327,6 +331,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
byte[] encryptedKey;
AlgorithmParameters algParams;
ObjectIdentifier algOid;
+
try {
// get the encrypted private key
EncryptedPrivateKeyInfo encrInfo =
@@ -347,7 +352,24 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
throw uke;
}
- try {
+ try {
+ PBEParameterSpec pbeSpec;
+ int ic = 0;
+
+ if (algParams != null) {
+ try {
+ pbeSpec =
+ algParams.getParameterSpec(PBEParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
+ throw new IOException("Invalid PBE algorithm parameters");
+ }
+ ic = pbeSpec.getIterationCount();
+
+ if (ic > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
+ }
+
byte[] keyInfo;
while (true) {
try {
@@ -387,9 +409,10 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
key = kfac.generatePrivate(kspec);
if (debug != null) {
- debug.println("Retrieved a protected private key (" +
- key.getClass().getName() + ") at alias '" + alias +
- "'");
+ debug.println("Retrieved a protected private key at alias" +
+ " '" + alias + "' (" +
+ new AlgorithmId(algOid).getName() +
+ " iterations: " + ic + ")");
}
// decode secret key
@@ -410,9 +433,10 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
}
if (debug != null) {
- debug.println("Retrieved a protected secret key (" +
- key.getClass().getName() + ") at alias '" + alias +
- "'");
+ debug.println("Retrieved a protected secret key at alias " +
+ "'" + alias + "' (" +
+ new AlgorithmId(algOid).getName() +
+ " iterations: " + ic + ")");
}
}
} catch (Exception e) {
@@ -590,9 +614,9 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
(key.getFormat().equals("PKCS8"))) {
if (debug != null) {
- debug.println("Setting a protected private key (" +
- key.getClass().getName() + ") at alias '" + alias +
- "'");
+ debug.println(
+ "Setting a protected private key at alias '" +
+ alias + "'");
}
// Encrypt the private key
@@ -638,9 +662,8 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
encryptPrivateKey(pkcs8.toByteArray(), passwordProtection);
if (debug != null) {
- debug.println("Setting a protected secret key (" +
- key.getClass().getName() + ") at alias '" + alias +
- "'");
+ debug.println("Setting a protected secret key at alias '" +
+ alias + "'");
}
secretKeyCount++;
entry = keyEntry;
@@ -761,19 +784,19 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
/*
* Generate PBE Algorithm Parameters
*/
- private AlgorithmParameters getAlgorithmParameters(String algorithm)
+ private AlgorithmParameters getPBEAlgorithmParameters(String algorithm)
throws IOException
{
AlgorithmParameters algParams = null;
// create PBE parameters from salt and iteration count
PBEParameterSpec paramSpec =
- new PBEParameterSpec(getSalt(), iterationCount);
+ new PBEParameterSpec(getSalt(), PBE_ITERATION_COUNT);
try {
algParams = AlgorithmParameters.getInstance(algorithm);
algParams.init(paramSpec);
} catch (Exception e) {
- throw new IOException("getAlgorithmParameters failed: " +
+ throw new IOException("getPBEAlgorithmParameters failed: " +
e.getMessage(), e);
}
return algParams;
@@ -859,7 +882,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
algParams = AlgorithmParameters.getInstance(algorithm);
algParams.init(algParamSpec);
} else {
- algParams = getAlgorithmParameters(algorithm);
+ algParams = getPBEAlgorithmParameters(algorithm);
}
} else {
// Check default key protection algorithm for PKCS12 keystores
@@ -879,7 +902,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (algorithm == null || algorithm.isEmpty()) {
algorithm = "PBEWithSHA1AndDESede";
}
- algParams = getAlgorithmParameters(algorithm);
+ algParams = getPBEAlgorithmParameters(algorithm);
}
ObjectIdentifier pbeOID = mapPBEAlgorithmToOID(algorithm);
@@ -1194,7 +1217,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (debug != null) {
debug.println("Storing " + (privateKeyCount + secretKeyCount) +
- " protected key(s) in a PKCS#7 data content-type");
+ " protected key(s) in a PKCS#7 data");
}
byte[] safeContentData = createSafeContent();
@@ -1207,7 +1230,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (debug != null) {
debug.println("Storing " + certificateCount +
- " certificate(s) in a PKCS#7 encryptedData content-type");
+ " certificate(s) in a PKCS#7 encryptedData");
}
byte[] encrData = createEncryptedData(password);
@@ -1478,7 +1501,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// generate MAC (MAC key is generated within JCE)
Mac m = Mac.getInstance("HmacPBESHA1");
PBEParameterSpec params =
- new PBEParameterSpec(salt, iterationCount);
+ new PBEParameterSpec(salt, MAC_ITERATION_COUNT);
SecretKey key = getPBEKey(passwd);
m.init(key, params);
m.update(data);
@@ -1486,7 +1509,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// encode as MacData
MacData macData = new MacData(algName, macResult, salt,
- iterationCount);
+ MAC_ITERATION_COUNT);
DerOutputStream bytes = new DerOutputStream();
bytes.write(macData.getEncoded());
mData = bytes.toByteArray();
@@ -1878,7 +1901,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// create AlgorithmParameters
AlgorithmParameters algParams =
- getAlgorithmParameters("PBEWithSHA1AndRC2_40");
+ getPBEAlgorithmParameters("PBEWithSHA1AndRC2_40");
DerOutputStream bytes = new DerOutputStream();
AlgorithmId algId =
new AlgorithmId(pbeWithSHAAnd40BitRC2CBC_OID, algParams);
@@ -1998,7 +2021,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (contentType.equals(ContentInfo.DATA_OID)) {
if (debug != null) {
- debug.println("Loading PKCS#7 data content-type");
+ debug.println("Loading PKCS#7 data");
}
safeContentsData = safeContents.getData();
@@ -2007,15 +2030,11 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (debug != null) {
debug.println("Warning: skipping PKCS#7 encryptedData" +
- " content-type - no password was supplied");
+ " - no password was supplied");
}
continue;
}
- if (debug != null) {
- debug.println("Loading PKCS#7 encryptedData content-type");
- }
-
DerInputStream edi =
safeContents.getContent().toDerInputStream();
int edVersion = edi.getInteger();
@@ -2036,6 +2055,30 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
ObjectIdentifier algOid = in.getOID();
AlgorithmParameters algParams = parseAlgParameters(algOid, in);
+ PBEParameterSpec pbeSpec;
+ int ic = 0;
+
+ if (algParams != null) {
+ try {
+ pbeSpec =
+ algParams.getParameterSpec(PBEParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
+ throw new IOException(
+ "Invalid PBE algorithm parameters");
+ }
+ ic = pbeSpec.getIterationCount();
+
+ if (ic > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
+ }
+
+ if (debug != null) {
+ debug.println("Loading PKCS#7 encryptedData " +
+ "(" + new AlgorithmId(algOid).getName() +
+ " iterations: " + ic + ")");
+ }
+
while (true) {
try {
// Use JCE
@@ -2066,8 +2109,15 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// The MacData is optional.
if (password != null && s.available() > 0) {
- MacData macData = new MacData(s);
- try {
+ MacData macData = new MacData(s);
+ int ic = macData.getIterations();
+
+ try {
+ if (ic > MAX_ITERATION_COUNT) {
+ throw new InvalidAlgorithmParameterException(
+ "MAC iteration count too large: " + ic);
+ }
+
String algName =
macData.getDigestAlgName().toUpperCase(Locale.ENGLISH);
@@ -2077,8 +2127,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
// generate MAC (MAC key is created within JCE)
Mac m = Mac.getInstance("HmacPBE" + algName);
PBEParameterSpec params =
- new PBEParameterSpec(macData.getSalt(),
- macData.getIterations());
+ new PBEParameterSpec(macData.getSalt(), ic);
SecretKey key = getPBEKey(password);
m.init(key, params);
m.update(authSafeData);
@@ -2086,16 +2135,16 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
if (debug != null) {
debug.println("Checking keystore integrity " +
- "(MAC algorithm: " + m.getAlgorithm() + ")");
+ "(" + m.getAlgorithm() + " iterations: " + ic + ")");
}
if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
throw new UnrecoverableKeyException("Failed PKCS12" +
" integrity checking");
}
- } catch (Exception e) {
+ } catch (Exception e) {
throw new IOException("Integrity check failed: " + e, e);
- }
+ }
}
/*
diff --git a/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java b/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
index 05150c95145..5d1a12d7d5c 100644
--- a/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
+++ b/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
@@ -65,6 +65,7 @@ import sun.security.util.PropertyExpander;
* This class is entirely deprecated.
*/
@Deprecated
+@SuppressWarnings("removal")
public class AuthPolicyFile extends javax.security.auth.Policy {
static final ResourceBundle rb =
diff --git a/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java b/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java
index f162b595f4b..50d9bcc2bce 100644
--- a/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java
+++ b/src/java.base/share/classes/sun/security/provider/DSAKeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.security.spec.InvalidParameterSpecException;
import java.security.spec.DSAParameterSpec;
import sun.security.jca.JCAUtil;
+import static sun.security.util.SecurityProviderConstants.DEF_DSA_KEY_SIZE;
+import static sun.security.util.SecurityProviderConstants.getDefDSASubprimeSize;
/**
* This class generates DSA key parameters and public/private key
@@ -45,15 +47,14 @@ import sun.security.jca.JCAUtil;
* @author Andreas Sterbenz
*
*/
-public class DSAKeyPairGenerator extends KeyPairGenerator
- implements java.security.interfaces.DSAKeyPairGenerator {
+class DSAKeyPairGenerator extends KeyPairGenerator {
/* Length for prime P and subPrime Q in bits */
private int plen;
private int qlen;
/* whether to force new parameters to be generated for each KeyPair */
- private boolean forceNewParameters;
+ boolean forceNewParameters;
/* preset algorithm parameters. */
private DSAParameterSpec params;
@@ -61,9 +62,9 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
/* The source of random bits to use */
private SecureRandom random;
- public DSAKeyPairGenerator() {
+ DSAKeyPairGenerator(int defaultKeySize) {
super("DSA");
- initialize(1024, null);
+ initialize(defaultKeySize, null);
}
private static void checkStrength(int sizeP, int sizeQ) {
@@ -84,61 +85,7 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
}
public void initialize(int modlen, SecureRandom random) {
- // generate new parameters when no precomputed ones available.
- initialize(modlen, true, random);
- this.forceNewParameters = false;
- }
-
- /**
- * Initializes the DSA key pair generator. If genParams
- * is false, a set of pre-computed parameters is used.
- */
- @Override
- public void initialize(int modlen, boolean genParams, SecureRandom random)
- throws InvalidParameterException {
-
- int subPrimeLen = -1;
- if (modlen <= 1024) {
- subPrimeLen = 160;
- } else if (modlen == 2048) {
- subPrimeLen = 224;
- } else if (modlen == 3072) {
- subPrimeLen = 256;
- }
- checkStrength(modlen, subPrimeLen);
- if (genParams) {
- params = null;
- } else {
- params = ParameterCache.getCachedDSAParameterSpec(modlen,
- subPrimeLen);
- if (params == null) {
- throw new InvalidParameterException
- ("No precomputed parameters for requested modulus size "
- + "available");
- }
-
- }
- this.plen = modlen;
- this.qlen = subPrimeLen;
- this.random = random;
- this.forceNewParameters = genParams;
- }
-
- /**
- * Initializes the DSA object using a DSA parameter object.
- *
- * @param params a fully initialized DSA parameter object.
- */
- @Override
- public void initialize(DSAParams params, SecureRandom random)
- throws InvalidParameterException {
-
- if (params == null) {
- throw new InvalidParameterException("Params must not be null");
- }
- DSAParameterSpec spec = new DSAParameterSpec
- (params.getP(), params.getQ(), params.getG());
- initialize0(spec, random);
+ init(modlen, random, false);
}
/**
@@ -157,10 +104,21 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
throw new InvalidAlgorithmParameterException
("Inappropriate parameter");
}
- initialize0((DSAParameterSpec)params, random);
+ init((DSAParameterSpec)params, random, false);
}
- private void initialize0(DSAParameterSpec params, SecureRandom random) {
+ void init(int modlen, SecureRandom random, boolean forceNew) {
+ int subPrimeLen = getDefDSASubprimeSize(modlen);
+ checkStrength(modlen, subPrimeLen);
+ this.plen = modlen;
+ this.qlen = subPrimeLen;
+ this.params = null;
+ this.random = random;
+ this.forceNewParameters = forceNew;
+ }
+
+ void init(DSAParameterSpec params, SecureRandom random,
+ boolean forceNew) {
int sizeP = params.getP().bitLength();
int sizeQ = params.getQ().bitLength();
checkStrength(sizeP, sizeQ);
@@ -168,7 +126,7 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
this.qlen = sizeQ;
this.params = params;
this.random = random;
- this.forceNewParameters = false;
+ this.forceNewParameters = forceNew;
}
/**
@@ -197,7 +155,7 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
return generateKeyPair(spec.getP(), spec.getQ(), spec.getG(), random);
}
- public KeyPair generateKeyPair(BigInteger p, BigInteger q, BigInteger g,
+ private KeyPair generateKeyPair(BigInteger p, BigInteger q, BigInteger g,
SecureRandom random) {
BigInteger x = generateX(random, q);
@@ -252,4 +210,55 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
return y;
}
+ public static final class Current extends DSAKeyPairGenerator {
+ public Current() {
+ super(DEF_DSA_KEY_SIZE);
+ }
+ }
+
+ public static final class Legacy extends DSAKeyPairGenerator
+ implements java.security.interfaces.DSAKeyPairGenerator {
+
+ public Legacy() {
+ super(1024);
+ }
+
+ /**
+ * Initializes the DSA key pair generator. If genParams
+ * is false, a set of pre-computed parameters is used.
+ */
+ @Override
+ public void initialize(int modlen, boolean genParams,
+ SecureRandom random) throws InvalidParameterException {
+ if (genParams) {
+ super.init(modlen, random, true);
+ } else {
+ DSAParameterSpec cachedParams =
+ ParameterCache.getCachedDSAParameterSpec(modlen,
+ getDefDSASubprimeSize(modlen));
+ if (cachedParams == null) {
+ throw new InvalidParameterException
+ ("No precomputed parameters for requested modulus" +
+ " size available");
+ }
+ super.init(cachedParams, random, false);
+ }
+ }
+
+ /**
+ * Initializes the DSA object using a DSA parameter object.
+ *
+ * @param params a fully initialized DSA parameter object.
+ */
+ @Override
+ public void initialize(DSAParams params, SecureRandom random)
+ throws InvalidParameterException {
+ if (params == null) {
+ throw new InvalidParameterException("Params must not be null");
+ }
+ DSAParameterSpec spec = new DSAParameterSpec
+ (params.getP(), params.getQ(), params.getG());
+ super.init(spec, random, false);
+ }
+ }
}
diff --git a/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java b/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java
index 220b5989f52..8c8ca9b42d4 100644
--- a/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java
+++ b/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,18 @@ import java.security.NoSuchProviderException;
import java.security.InvalidParameterException;
import java.security.MessageDigest;
import java.security.SecureRandom;
+import java.security.ProviderException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidParameterSpecException;
import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAGenParameterSpec;
+import static sun.security.util.SecurityProviderConstants.DEF_DSA_KEY_SIZE;
+import static sun.security.util.SecurityProviderConstants.getDefDSASubprimeSize;
+
+
/**
- * This class generates parameters for the DSA algorithm. It uses a default
- * prime modulus size of 1024 bits, which can be overwritten during
- * initialization.
+ * This class generates parameters for the DSA algorithm.
*
* @author Jan Luehe
*
@@ -56,10 +59,6 @@ import java.security.spec.DSAGenParameterSpec;
public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
- // the default parameters
- private static final DSAGenParameterSpec DEFAULTS =
- new DSAGenParameterSpec(1024, 160, 160);
-
// the length of prime P, subPrime Q, and seed in bits
private int valueL = -1;
private int valueN = -1;
@@ -80,18 +79,14 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
*/
@Override
protected void engineInit(int strength, SecureRandom random) {
- if ((strength >= 512) && (strength <= 1024) && (strength % 64 == 0)) {
- this.valueN = 160;
- } else if (strength == 2048) {
- this.valueN = 224;
- } else if (strength == 3072) {
- this.valueN = 256;
- } else {
+ if ((strength != 2048) && (strength != 3072) &&
+ ((strength < 512) || (strength > 1024) || (strength % 64 != 0))) {
throw new InvalidParameterException(
- "Unexpected strength (size of prime): " + strength + ". " +
- "Prime size should be 512 - 1024, or 2048, 3072");
+ "Unexpected strength (size of prime): " + strength +
+ ". Prime size should be 512-1024, 2048, or 3072");
}
this.valueL = strength;
+ this.valueN = getDefDSASubprimeSize(strength);
this.seedLen = valueN;
this.random = random;
}
@@ -110,7 +105,6 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
@Override
protected void engineInit(AlgorithmParameterSpec genParamSpec,
SecureRandom random) throws InvalidAlgorithmParameterException {
-
if (!(genParamSpec instanceof DSAGenParameterSpec)) {
throw new InvalidAlgorithmParameterException("Invalid parameter");
}
@@ -136,11 +130,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
this.random = new SecureRandom();
}
if (valueL == -1) {
- try {
- engineInit(DEFAULTS, this.random);
- } catch (InvalidAlgorithmParameterException iape) {
- // should never happen
- }
+ engineInit(DEF_DSA_KEY_SIZE, this.random);
}
BigInteger[] pAndQ = generatePandQ(this.random, valueL,
valueN, seedLen);
@@ -206,13 +196,17 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
int b = (valueL - 1) % outLen;
byte[] seedBytes = new byte[seedLen/8];
BigInteger twoSl = BigInteger.TWO.pow(seedLen);
- int primeCertainty = 80; // for 1024-bit prime P
- if (valueL == 2048) {
+ int primeCertainty = -1;
+ if (valueL <= 1024) {
+ primeCertainty = 80;
+ } else if (valueL == 2048) {
primeCertainty = 112;
} else if (valueL == 3072) {
primeCertainty = 128;
}
-
+ if (primeCertainty < 0) {
+ throw new ProviderException("Invalid valueL: " + valueL);
+ }
BigInteger resultP, resultQ, seed = null;
int counter;
while (true) {
diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
index 31164695ecc..f440f1556ce 100644
--- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
+++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.io.*;
import java.net.*;
import java.util.Map;
import java.security.*;
+import sun.security.action.GetPropertyAction;
/**
* Defines the entries of the SUN provider.
@@ -74,6 +75,10 @@ import java.security.*;
final class SunEntries {
+ private static final boolean useLegacyDSA =
+ Boolean.parseBoolean(GetPropertyAction.privilegedGetProperty
+ ("jdk.security.legacyDSAKeyPairGenerator"));
+
private SunEntries() {
// empty
}
@@ -174,8 +179,9 @@ final class SunEntries {
/*
* Key Pair Generator engines
*/
- map.put("KeyPairGenerator.DSA",
- "sun.security.provider.DSAKeyPairGenerator");
+ String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
+ dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
+ map.put("KeyPairGenerator.DSA", dsaKPGImplClass);
map.put("Alg.Alias.KeyPairGenerator.OID.1.2.840.10040.4.1", "DSA");
map.put("Alg.Alias.KeyPairGenerator.1.2.840.10040.4.1", "DSA");
map.put("Alg.Alias.KeyPairGenerator.1.3.14.3.2.12", "DSA");
diff --git a/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java b/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java
index f67786e432c..b6551cc9403 100644
--- a/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java
+++ b/src/java.base/share/classes/sun/security/provider/certpath/ResponderId.java
@@ -119,7 +119,7 @@ public final class ResponderId {
* When encoded in DER this object will use the byKey option, a
* SHA-1 hash of the responder's public key.
*
- * @param pubKey the the OCSP responder's public key
+ * @param pubKey the OCSP responder's public key
*
* @throws IOException if the internal DER-encoding of the
* {@code KeyIdentifier} fails.
diff --git a/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java b/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
index 8ba440d5181..db896a78f17 100644
--- a/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
+++ b/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
@@ -94,7 +94,7 @@ public class SunCertPathBuilderException extends CertPathBuilderException {
}
/**
- * Creates a SunCertPathBuilderException withe the specified
+ * Creates a SunCertPathBuilderException with the specified
* detail message and adjacency list.
*
* @param msg the detail message
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java b/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
index 0901e4c7af6..6ad77b52361 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.RSAKeyGenParameterSpec;
import sun.security.jca.JCAUtil;
+import static sun.security.util.SecurityProviderConstants.DEF_RSA_KEY_SIZE;
/**
* RSA keypair generation. Standard algorithm, minimum key length 512 bit.
@@ -55,7 +56,7 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi {
public RSAKeyPairGenerator() {
// initialize to default in case the app does not call initialize()
- initialize(2048, null);
+ initialize(DEF_RSA_KEY_SIZE, null);
}
// initialize the generator. See JCA doc
diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java b/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java
index 1f4ee77c92f..b44c20f72cc 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java
@@ -145,7 +145,7 @@ final class CertStatusReqItemV2 {
* @return the encoded length of this {@code CertStatusReqItemV2}
*/
int length() {
- // The length is the the status type (1 byte) + the request length
+ // The length is the status type (1 byte) + the request length
// field (2 bytes) + the StatusRequest data length.
return request.length() + 3;
}
diff --git a/src/java.base/share/classes/sun/security/ssl/MAC.java b/src/java.base/share/classes/sun/security/ssl/MAC.java
index 20c73db6b01..250e97fbc0f 100644
--- a/src/java.base/share/classes/sun/security/ssl/MAC.java
+++ b/src/java.base/share/classes/sun/security/ssl/MAC.java
@@ -188,7 +188,7 @@ final class MAC extends Authenticator {
* @param type record type
* @param bb a ByteBuffer in which the position and limit
* demarcate the data to be MAC'd.
- * @param isSimulated if true, simulate the the MAC computation
+ * @param isSimulated if true, simulate the MAC computation
*
* @return the MAC result
*/
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
index 5681a7de1f4..6685d754a1b 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -333,7 +333,7 @@ final class TrustStoreManager {
}
/**
- * Load the the KeyStore as described in the specified descriptor.
+ * Load the KeyStore as described in the specified descriptor.
*/
private static KeyStore loadKeyStore(
TrustStoreDescriptor descriptor) throws Exception {
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index dac650b1451..c881da60d44 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -26,6 +26,8 @@
package sun.security.tools.keytool;
import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.CodeSigner;
import java.security.CryptoPrimitive;
import java.security.KeyStore;
@@ -72,6 +74,7 @@ import sun.security.pkcs10.PKCS10Attribute;
import sun.security.provider.X509Factory;
import sun.security.provider.certpath.ssl.SSLServerCertStore;
import sun.security.util.Password;
+import sun.security.util.SecurityProviderConstants;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
@@ -168,7 +171,12 @@ public final class Main {
private List ids = new ArrayList<>(); // used in GENCRL
private List v3ext = new ArrayList<>();
- // Warnings on weak algorithms
+ // In-place importkeystore is special.
+ // A backup is needed, and no need to prompt for deststorepass.
+ private boolean inplaceImport = false;
+ private String inplaceBackupName = null;
+
+ // Warnings on weak algorithms etc
private List weakWarnings = new ArrayList<>();
private static final DisabledAlgorithmConstraints DISABLED_CHECK =
@@ -846,37 +854,52 @@ public final class Main {
("New.password.must.be.at.least.6.characters"));
}
+ // Set this before inplaceImport check so we can compare name.
+ if (ksfname == null) {
+ ksfname = System.getProperty("user.home") + File.separator
+ + ".keystore";
+ }
+
+ KeyStore srcKeyStore = null;
+ if (command == IMPORTKEYSTORE) {
+ inplaceImport = inplaceImportCheck();
+ if (inplaceImport) {
+ // We load srckeystore first so we have srcstorePass that
+ // can be assigned to storePass
+ srcKeyStore = loadSourceKeyStore();
+ if (storePass == null) {
+ storePass = srcstorePass;
+ }
+ }
+ }
+
// Check if keystore exists.
// If no keystore has been specified at the command line, try to use
// the default, which is located in $HOME/.keystore.
// If the command is "genkey", "identitydb", "import", or "printcert",
// it is OK not to have a keystore.
- if (isKeyStoreRelated(command)) {
- if (ksfname == null) {
- ksfname = System.getProperty("user.home") + File.separator
- + ".keystore";
- }
- if (!nullStream) {
- try {
- ksfile = new File(ksfname);
- // Check if keystore file is empty
- if (ksfile.exists() && ksfile.length() == 0) {
- throw new Exception(rb.getString
- ("Keystore.file.exists.but.is.empty.") + ksfname);
- }
- ksStream = new FileInputStream(ksfile);
- } catch (FileNotFoundException e) {
- if (command != GENKEYPAIR &&
+ // DO NOT open the existing keystore if this is an in-place import.
+ // The keystore should be created as brand new.
+ if (isKeyStoreRelated(command) && !nullStream && !inplaceImport) {
+ try {
+ ksfile = new File(ksfname);
+ // Check if keystore file is empty
+ if (ksfile.exists() && ksfile.length() == 0) {
+ throw new Exception(rb.getString
+ ("Keystore.file.exists.but.is.empty.") + ksfname);
+ }
+ ksStream = new FileInputStream(ksfile);
+ } catch (FileNotFoundException e) {
+ if (command != GENKEYPAIR &&
command != GENSECKEY &&
command != IDENTITYDB &&
command != IMPORTCERT &&
command != IMPORTPASS &&
command != IMPORTKEYSTORE &&
command != PRINTCRL) {
- throw new Exception(rb.getString
- ("Keystore.file.does.not.exist.") + ksfname);
- }
+ throw new Exception(rb.getString
+ ("Keystore.file.does.not.exist.") + ksfname);
}
}
}
@@ -900,7 +923,7 @@ public final class Main {
// Create new keystore
// Probe for keystore type when filename is available
if (ksfile != null && ksStream != null && providerName == null &&
- hasStoretypeOption == false) {
+ hasStoretypeOption == false && !inplaceImport) {
keyStore = KeyStore.getInstance(ksfile, storePass);
} else {
if (providerName == null) {
@@ -930,7 +953,11 @@ public final class Main {
* Null stream keystores are loaded later.
*/
if (!nullStream) {
- keyStore.load(ksStream, storePass);
+ if (inplaceImport) {
+ keyStore.load(null, storePass);
+ } else {
+ keyStore.load(ksStream, storePass);
+ }
if (ksStream != null) {
ksStream.close();
}
@@ -1167,7 +1194,11 @@ public final class Main {
}
}
} else if (command == IMPORTKEYSTORE) {
- doImportKeyStore();
+ // When not in-place import, srcKeyStore is not loaded yet.
+ if (srcKeyStore == null) {
+ srcKeyStore = loadSourceKeyStore();
+ }
+ doImportKeyStore(srcKeyStore);
kssave = true;
} else if (command == KEYCLONE) {
keyPassNew = newPass;
@@ -1298,6 +1329,51 @@ public final class Main {
}
}
}
+
+ if (isKeyStoreRelated(command)
+ && !token && !nullStream && ksfname != null) {
+
+ // JKS storetype warning on the final result keystore
+ File f = new File(ksfname);
+ char[] pass = (storePassNew!=null) ? storePassNew : storePass;
+ if (f.exists()) {
+ // Probe for real type. A JKS can be loaded as PKCS12 because
+ // DualFormat support, vice versa.
+ keyStore = KeyStore.getInstance(f, pass);
+ String realType = keyStore.getType();
+ if (realType.equalsIgnoreCase("JKS")
+ || realType.equalsIgnoreCase("JCEKS")) {
+ boolean allCerts = true;
+ for (String a : Collections.list(keyStore.aliases())) {
+ if (!keyStore.entryInstanceOf(
+ a, TrustedCertificateEntry.class)) {
+ allCerts = false;
+ break;
+ }
+ }
+ // Don't warn for "cacerts" style keystore.
+ if (!allCerts) {
+ weakWarnings.add(String.format(
+ rb.getString("jks.storetype.warning"),
+ realType, ksfname));
+ }
+ }
+ if (inplaceImport) {
+ String realSourceStoreType = KeyStore.getInstance(
+ new File(inplaceBackupName), srcstorePass).getType();
+ String format =
+ realType.equalsIgnoreCase(realSourceStoreType) ?
+ rb.getString("backup.keystore.warning") :
+ rb.getString("migrate.keystore.warning");
+ weakWarnings.add(
+ String.format(format,
+ srcksfname,
+ realSourceStoreType,
+ inplaceBackupName,
+ realType));
+ }
+ }
+ }
}
/**
@@ -1742,9 +1818,12 @@ public final class Main {
{
if (keysize == -1) {
if ("EC".equalsIgnoreCase(keyAlgName)) {
- keysize = 256;
- } else {
- keysize = 2048; // RSA and DSA
+ keysize = SecurityProviderConstants.DEF_EC_KEY_SIZE;
+ } else if ("RSA".equalsIgnoreCase(keyAlgName)) {
+ keysize = SecurityProviderConstants.DEF_RSA_KEY_SIZE;
+ } else if ("DSA".equalsIgnoreCase(keyAlgName)) {
+ // hardcode for now as DEF_DSA_KEY_SIZE is still 1024
+ keysize = 2048; // SecurityProviderConstants.DEF_DSA_KEY_SIZE;
}
}
@@ -1989,12 +2068,40 @@ public final class Main {
}
}
+ boolean inplaceImportCheck() throws Exception {
+ if (P11KEYSTORE.equalsIgnoreCase(srcstoretype) ||
+ KeyStoreUtil.isWindowsKeyStore(srcstoretype)) {
+ return false;
+ }
+
+ if (srcksfname != null) {
+ File srcksfile = new File(srcksfname);
+ if (srcksfile.exists() && srcksfile.length() == 0) {
+ throw new Exception(rb.getString
+ ("Source.keystore.file.exists.but.is.empty.") +
+ srcksfname);
+ }
+ if (srcksfile.getCanonicalFile()
+ .equals(new File(ksfname).getCanonicalFile())) {
+ return true;
+ } else {
+ // Informational, especially if destkeystore is not
+ // provided, which default to ~/.keystore.
+ System.err.println(String.format(rb.getString(
+ "importing.keystore.status"), srcksfname, ksfname));
+ return false;
+ }
+ } else {
+ throw new Exception(rb.getString
+ ("Please.specify.srckeystore"));
+ }
+ }
+
/**
* Load the srckeystore from a stream, used in -importkeystore
* @return the src KeyStore
*/
KeyStore loadSourceKeyStore() throws Exception {
- boolean isPkcs11 = false;
InputStream is = null;
File srcksfile = null;
@@ -2007,20 +2114,9 @@ public final class Main {
System.err.println();
tinyHelp();
}
- isPkcs11 = true;
} else {
- if (srcksfname != null) {
- srcksfile = new File(srcksfname);
- if (srcksfile.exists() && srcksfile.length() == 0) {
- throw new Exception(rb.getString
- ("Source.keystore.file.exists.but.is.empty.") +
- srcksfname);
- }
- is = new FileInputStream(srcksfile);
- } else {
- throw new Exception(rb.getString
- ("Please.specify.srckeystore"));
- }
+ srcksfile = new File(srcksfname);
+ is = new FileInputStream(srcksfile);
}
KeyStore store;
@@ -2087,17 +2183,32 @@ public final class Main {
* keep alias unchanged if no name conflict, otherwise, prompt.
* keep keypass unchanged for keys
*/
- private void doImportKeyStore() throws Exception {
+ private void doImportKeyStore(KeyStore srcKS) throws Exception {
if (alias != null) {
- doImportKeyStoreSingle(loadSourceKeyStore(), alias);
+ doImportKeyStoreSingle(srcKS, alias);
} else {
if (dest != null || srckeyPass != null) {
throw new Exception(rb.getString(
"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified"));
}
- doImportKeyStoreAll(loadSourceKeyStore());
+ doImportKeyStoreAll(srcKS);
}
+
+ if (inplaceImport) {
+ // Backup to file.old or file.old2...
+ // The keystore is not rewritten yet now.
+ for (int n = 1; /* forever */; n++) {
+ inplaceBackupName = srcksfname + ".old" + (n == 1 ? "" : n);
+ File bkFile = new File(inplaceBackupName);
+ if (!bkFile.exists()) {
+ Files.copy(Paths.get(srcksfname), bkFile.toPath());
+ break;
+ }
+ }
+
+ }
+
/*
* Information display rule of -importkeystore
* 1. inside single, shows failure
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
index 9bdd95cbda0..5213b1a7903 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -471,6 +471,10 @@ public class Resources extends java.util.ListResourceBundle {
{"verified.by.s.in.s.weak", "Verified by %s in %s with a %s"},
{"whose.sigalg.risk", "%s uses the %s signature algorithm which is considered a security risk."},
{"whose.key.risk", "%s uses a %s which is considered a security risk."},
+ {"jks.storetype.warning", "The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
+ {"migrate.keystore.warning", "Migrated \"%1$s\" to %4$s. The %2$s keystore is backed up as \"%3$s\"."},
+ {"backup.keystore.warning", "The original keystore \"%1$s\" is backed up as \"%3$s\"..."},
+ {"importing.keystore.status", "Importing keystore %1$s to %2$s..."},
};
diff --git a/src/java.base/share/classes/sun/security/util/IOUtils.java b/src/java.base/share/classes/sun/security/util/IOUtils.java
index cd4de12bf69..6cf900d8ec1 100644
--- a/src/java.base/share/classes/sun/security/util/IOUtils.java
+++ b/src/java.base/share/classes/sun/security/util/IOUtils.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
public class IOUtils {
/**
- * Read up to length of bytes from in
+ * Read up to {@code length} of bytes from {@code in}
* until EOF is detected.
* @param is input stream, must not be null
* @param length number of bytes to read
@@ -78,4 +78,22 @@ public class IOUtils {
}
return output;
}
+
+ /**
+ * Read {@code length} of bytes from {@code in}. An exception is
+ * thrown if there are not enough bytes in the stream.
+ *
+ * @param is input stream, must not be null
+ * @param length number of bytes to read, must not be negative
+ * @return bytes read
+ * @throws IOException if any IO error or a premature EOF is detected, or
+ * if {@code length} is negative since this length is usually also
+ * read from {@code is}.
+ */
+ public static byte[] readNBytes(InputStream is, int length) throws IOException {
+ if (length < 0) {
+ throw new IOException("length cannot be negative: " + length);
+ }
+ return readFully(is, length, true);
+ }
}
diff --git a/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java b/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
index 12aabe6f071..514b993849a 100644
--- a/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
+++ b/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,11 @@ class ObjectIdentifier implements Serializable
is.defaultReadObject();
if (encoding == null) { // from an old version
- init((int[])components, componentLen);
+ int[] comp = (int[])components;
+ if (componentLen > comp.length) {
+ componentLen = comp.length;
+ }
+ init(comp, componentLen);
}
}
diff --git a/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
new file mode 100644
index 00000000000..16499519b58
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.util;
+
+import java.util.regex.PatternSyntaxException;
+import java.security.InvalidParameterException;
+import sun.security.action.GetPropertyAction;
+
+/**
+ * Various constants such as version number, default key length, used by
+ * the JDK security/crypto providers.
+ */
+public final class SecurityProviderConstants {
+ private static final Debug debug =
+ Debug.getInstance("jca", "ProviderConfig");
+
+ // Cannot create one of these
+ private SecurityProviderConstants () {
+ }
+
+ public static final int getDefDSASubprimeSize(int primeSize) {
+ if (primeSize <= 1024) {
+ return 160;
+ } else if (primeSize == 2048) {
+ return 224;
+ } else if (primeSize == 3072) {
+ return 256;
+ } else {
+ throw new InvalidParameterException("Invalid DSA Prime Size: " +
+ primeSize);
+ }
+ }
+
+ public static final int DEF_DSA_KEY_SIZE;
+ public static final int DEF_RSA_KEY_SIZE;
+ public static final int DEF_DH_KEY_SIZE;
+ public static final int DEF_EC_KEY_SIZE;
+
+ private static final String KEY_LENGTH_PROP =
+ "jdk.security.defaultKeySize";
+ static {
+ String keyLengthStr = GetPropertyAction.privilegedGetProperty
+ (KEY_LENGTH_PROP);
+ int dsaKeySize = 1024;
+ int rsaKeySize = 2048;
+ int dhKeySize = 2048;
+ int ecKeySize = 256;
+
+ if (keyLengthStr != null) {
+ try {
+ String[] pairs = keyLengthStr.split(",");
+ for (String p : pairs) {
+ String[] algoAndValue = p.split(":");
+ if (algoAndValue.length != 2) {
+ // invalid pair, skip to next pair
+ if (debug != null) {
+ debug.println("Ignoring invalid pair in " +
+ KEY_LENGTH_PROP + " property: " + p);
+ }
+ continue;
+ }
+ String algoName = algoAndValue[0].trim().toUpperCase();
+ int value = -1;
+ try {
+ value = Integer.parseInt(algoAndValue[1].trim());
+ } catch (NumberFormatException nfe) {
+ // invalid value, skip to next pair
+ if (debug != null) {
+ debug.println("Ignoring invalid value in " +
+ KEY_LENGTH_PROP + " property: " + p);
+ }
+ continue;
+ }
+ if (algoName.equals("DSA")) {
+ dsaKeySize = value;
+ } else if (algoName.equals("RSA")) {
+ rsaKeySize = value;
+ } else if (algoName.equals("DH")) {
+ dhKeySize = value;
+ } else if (algoName.equals("EC")) {
+ ecKeySize = value;
+ } else {
+ if (debug != null) {
+ debug.println("Ignoring unsupported algo in " +
+ KEY_LENGTH_PROP + " property: " + p);
+ }
+ continue;
+ }
+ if (debug != null) {
+ debug.println("Overriding default " + algoName +
+ " keysize with value from " +
+ KEY_LENGTH_PROP + " property: " + value);
+ }
+ }
+ } catch (PatternSyntaxException pse) {
+ // if property syntax is not followed correctly
+ if (debug != null) {
+ debug.println("Unexpected exception while parsing " +
+ KEY_LENGTH_PROP + " property: " + pse);
+ }
+ }
+ }
+ DEF_DSA_KEY_SIZE = dsaKeySize;
+ DEF_RSA_KEY_SIZE = rsaKeySize;
+ DEF_DH_KEY_SIZE = dhKeySize;
+ DEF_EC_KEY_SIZE = ecKeySize;
+ }
+}
diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
index 9c2826c16dd..5a459267130 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
@@ -724,7 +724,8 @@ public class SignatureFileVerifier {
if (signers == null) {
signers = new ArrayList<>();
}
- // Append the new code signer
+ // Append the new code signer. If timestamp is invalid, this
+ // jar will be treated as unsigned.
signers.add(new CodeSigner(certChain, info.getTimestamp()));
if (debug != null) {
diff --git a/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java b/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
index eafe3eefe78..88f787e0704 100644
--- a/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import java.util.*;
import javax.security.auth.x500.X500Principal;
+import sun.net.util.IPAddressUtil;
import sun.security.util.*;
import sun.security.pkcs.PKCS9Attribute;
@@ -440,6 +441,7 @@ implements CertAttrSet, Cloneable {
X500Principal subjectPrincipal = cert.getSubjectX500Principal();
X500Name subject = X500Name.asX500Name(subjectPrincipal);
+ // Check subject as an X500Name
if (subject.isEmpty() == false) {
if (verify(subject) == false) {
return false;
@@ -465,12 +467,51 @@ implements CertAttrSet, Cloneable {
"certificate: " + ce.getMessage());
}
- // If there are no subjectAlternativeNames, perform the special-case
- // check where if the subjectName contains any EMAILADDRESS
- // attributes, they must be checked against RFC822 constraints.
- // If that passes, we're fine.
if (altNames == null) {
- return verifyRFC822SpecialCase(subject);
+ altNames = new GeneralNames();
+
+ // RFC 5280 4.2.1.10:
+ // When constraints are imposed on the rfc822Name name form,
+ // but the certificate does not include a subject alternative name,
+ // the rfc822Name constraint MUST be applied to the attribute of
+ // type emailAddress in the subject distinguished name.
+ for (AVA ava : subject.allAvas()) {
+ ObjectIdentifier attrOID = ava.getObjectIdentifier();
+ if (attrOID.equals(PKCS9Attribute.EMAIL_ADDRESS_OID)) {
+ String attrValue = ava.getValueString();
+ if (attrValue != null) {
+ try {
+ altNames.add(new GeneralName(
+ new RFC822Name(attrValue)));
+ } catch (IOException ioe) {
+ continue;
+ }
+ }
+ }
+ }
+ }
+
+ // If there is no IPAddressName or DNSName in subjectAlternativeNames,
+ // see if the last CN inside subjectName can be used instead.
+ DerValue derValue = subject.findMostSpecificAttribute
+ (X500Name.commonName_oid);
+ String cn = derValue == null ? null : derValue.getAsString();
+
+ if (cn != null) {
+ try {
+ if (IPAddressUtil.isIPv4LiteralAddress(cn) ||
+ IPAddressUtil.isIPv6LiteralAddress(cn)) {
+ if (!hasNameType(altNames, GeneralNameInterface.NAME_IP)) {
+ altNames.add(new GeneralName(new IPAddressName(cn)));
+ }
+ } else {
+ if (!hasNameType(altNames, GeneralNameInterface.NAME_DNS)) {
+ altNames.add(new GeneralName(new DNSName(cn)));
+ }
+ }
+ } catch (IOException ioe) {
+ // OK, cn is neither IP nor DNS
+ }
}
// verify each subjectAltName
@@ -485,6 +526,15 @@ implements CertAttrSet, Cloneable {
return true;
}
+ private static boolean hasNameType(GeneralNames names, int type) {
+ for (GeneralName name : names.names()) {
+ if (name.getType() == type) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* check whether a name conforms to these NameConstraints.
* This involves verifying that the name is consistent with the
@@ -566,37 +616,6 @@ implements CertAttrSet, Cloneable {
return true;
}
- /**
- * Perform the RFC 822 special case check. We have a certificate
- * that does not contain any subject alternative names. Check that
- * any EMAILADDRESS attributes in its subject name conform to these
- * NameConstraints.
- *
- * @param subject the certificate's subject name
- * @return true if certificate verifies successfully
- * @throws IOException on error
- */
- public boolean verifyRFC822SpecialCase(X500Name subject) throws IOException {
- for (AVA ava : subject.allAvas()) {
- ObjectIdentifier attrOID = ava.getObjectIdentifier();
- if (attrOID.equals(PKCS9Attribute.EMAIL_ADDRESS_OID)) {
- String attrValue = ava.getValueString();
- if (attrValue != null) {
- RFC822Name emailName;
- try {
- emailName = new RFC822Name(attrValue);
- } catch (IOException ioe) {
- continue;
- }
- if (!verify(emailName)) {
- return(false);
- }
- }
- }
- }
- return true;
- }
-
/**
* Clone all objects that may be modified during certificate validation.
*/
diff --git a/src/java.base/share/classes/sun/text/normalizer/Trie2.java b/src/java.base/share/classes/sun/text/normalizer/Trie2.java
index 32e237bb8f3..5d57f08a85d 100644
--- a/src/java.base/share/classes/sun/text/normalizer/Trie2.java
+++ b/src/java.base/share/classes/sun/text/normalizer/Trie2.java
@@ -592,7 +592,7 @@ abstract class Trie2 implements Iterable {
// may be lower when iterating over the code points for a single lead surrogate.
private int limitCP;
- // True while iterating over the the Trie2 values for code points.
+ // True while iterating over the Trie2 values for code points.
// False while iterating over the alternate values for lead surrogates.
private boolean doingCodePoints = true;
diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
index d9982fb8e0f..d1a92b8feb6 100644
--- a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
@@ -27,6 +27,7 @@ package sun.util.cldr;
import java.security.AccessController;
import java.security.AccessControlException;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.text.spi.BreakIteratorProvider;
import java.text.spi.CollatorProvider;
@@ -83,11 +84,8 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
return null;
}
});
- } catch (Exception e) {
- // Catch any exception, and continue as if only CLDR's base locales exist.
- } catch (ServiceConfigurationError sce) {
- Throwable cause = sce.getCause();
- if (!(cause instanceof AccessControlException)) throw sce;
+ } catch (PrivilegedActionException pae) {
+ throw new InternalError(pae.getCause());
}
nonBaseMetaInfo = nbmi;
diff --git a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
index 21e94404ec1..aca1dfe4e01 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
@@ -28,6 +28,7 @@ package sun.util.locale.provider;
import java.security.AccessController;
import java.security.AccessControlException;
import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.text.spi.BreakIteratorProvider;
import java.text.spi.CollatorProvider;
@@ -478,11 +479,8 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
if (nonBaseTags != null) {
supportedLocaleString += " " + nonBaseTags;
}
- } catch (Exception e) {
- // catch any exception, and ignore them as if non-EN locales do not exist.
- } catch (ServiceConfigurationError sce) {
- Throwable cause = sce.getCause();
- if (!(cause instanceof AccessControlException)) throw sce;
+ } catch (PrivilegedActionException pae) {
+ throw new InternalError(pae.getCause());
}
return supportedLocaleString;
diff --git a/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java b/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java
index 116085b70a1..431d9396851 100644
--- a/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/FileDispatcherImpl.java
@@ -122,6 +122,17 @@ class FileDispatcherImpl extends FileDispatcher {
return false;
}
+ int setDirectIO(FileDescriptor fd, String path) {
+ int result = -1;
+ try {
+ result = setDirect0(fd);
+ } catch (IOException e) {
+ throw new UnsupportedOperationException
+ ("Error setting up DirectIO", e);
+ }
+ return result;
+ }
+
// -- Native methods --
static native int read0(FileDescriptor fd, long address, int len)
@@ -167,6 +178,8 @@ class FileDispatcherImpl extends FileDispatcher {
static native void closeIntFD(int fd) throws IOException;
+ static native int setDirect0(FileDescriptor fd) throws IOException;
+
static native void init();
}
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
index d13681998c3..37113d4ca92 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ class UnixChannelFactory {
boolean deleteOnClose;
boolean sync;
boolean dsync;
+ boolean direct;
static Flags toFlags(Set options) {
Flags flags = new Flags();
@@ -88,6 +89,12 @@ class UnixChannelFactory {
flags.noFollowLinks = true;
continue;
}
+
+ if (ExtendedOptions.DIRECT.matches(option)) {
+ flags.direct = true;
+ continue;
+ }
+
if (option == null)
throw new NullPointerException();
throw new UnsupportedOperationException(option + " not supported");
@@ -103,7 +110,7 @@ class UnixChannelFactory {
static FileChannel newFileChannel(int fd, String path, boolean reading, boolean writing) {
FileDescriptor fdObj = new FileDescriptor();
fdAccess.set(fdObj, fd);
- return FileChannelImpl.open(fdObj, path, reading, writing, null);
+ return FileChannelImpl.open(fdObj, path, reading, writing, false, null);
}
/**
@@ -134,7 +141,8 @@ class UnixChannelFactory {
throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed");
FileDescriptor fdObj = open(dfd, path, pathForPermissionCheck, flags, mode);
- return FileChannelImpl.open(fdObj, path.toString(), flags.read, flags.write, null);
+ return FileChannelImpl.open(fdObj, path.toString(), flags.read,
+ flags.write, flags.direct, null);
}
/**
@@ -235,6 +243,8 @@ class UnixChannelFactory {
oflags |= O_DSYNC;
if (flags.sync)
oflags |= O_SYNC;
+ if (flags.direct)
+ oflags |= O_DIRECT;
// permission check before we open the file
SecurityManager sm = System.getSecurityManager();
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template b/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
index 05eee45a6bb..594546beaa5 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -70,6 +70,12 @@ class UnixConstants {
static final int PREFIX_O_NOFOLLOW = 00;
#endif
+#ifdef O_DIRECT
+ static final int PREFIX_O_DIRECT = O_DIRECT;
+#else
+ // not supported (dummy values will not be used at runtime).
+ static final int PREFIX_O_DIRECT = 00;
+#endif
static final int PREFIX_S_IAMB =
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
index 20362d31f19..4a577e60a09 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -125,6 +125,12 @@ abstract class UnixFileStore
return attrs.blockSize() * attrs.availableBlocks();
}
+ @Override
+ public long getBlockSize() throws IOException {
+ UnixFileStoreAttributes attrs = readAttributes();
+ return attrs.blockSize();
+ }
+
@Override
public long getUnallocatedSpace() throws IOException {
UnixFileStoreAttributes attrs = readAttributes();
diff --git a/src/java.base/unix/native/libnio/ch/FileChannelImpl.c b/src/java.base/unix/native/libnio/ch/FileChannelImpl.c
index 520448d6b09..a3c2ac91fd5 100644
--- a/src/java.base/unix/native/libnio/ch/FileChannelImpl.c
+++ b/src/java.base/unix/native/libnio/ch/FileChannelImpl.c
@@ -50,7 +50,7 @@
#define mmap64 mmap
#endif
-static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */
+static jfieldID chan_fd; /* jobject 'fd' in sun.nio.ch.FileChannelImpl */
JNIEXPORT jlong JNICALL
Java_sun_nio_ch_FileChannelImpl_initIDs(JNIEnv *env, jclass clazz)
diff --git a/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
index 2dd6596091b..098535db7d6 100644
--- a/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
+++ b/src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#if defined(__linux__)
#include
#include
@@ -323,3 +324,58 @@ Java_sun_nio_ch_FileDispatcherImpl_closeIntFD(JNIEnv *env, jclass clazz, jint fd
{
closeFileDescriptor(env, fd);
}
+
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_FileDispatcherImpl_setDirect0(JNIEnv *env, jclass clazz,
+ jobject fdo)
+{
+ jint fd = fdval(env, fdo);
+ jint result;
+#ifdef MACOSX
+ struct statvfs file_stat;
+#else
+ struct statvfs64 file_stat;
+#endif
+
+#if defined(O_DIRECT) || defined(F_NOCACHE) || defined(DIRECTIO_ON)
+#ifdef O_DIRECT
+ jint orig_flag;
+ orig_flag = fcntl(fd, F_GETFL);
+ if (orig_flag == -1) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ return -1;
+ }
+ result = fcntl(fd, F_SETFL, orig_flag | O_DIRECT);
+ if (result == -1) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ return result;
+ }
+#elif F_NOCACHE
+ result = fcntl(fd, F_NOCACHE, 1);
+ if (result == -1) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ return result;
+ }
+#elif DIRECTIO_ON
+ result = directio(fd, DIRECTIO_ON);
+ if (result == -1) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ return result;
+ }
+#endif
+#ifdef MACOSX
+ result = fstatvfs(fd, &file_stat);
+#else
+ result = fstatvfs64(fd, &file_stat);
+#endif
+ if(result == -1) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ return result;
+ } else {
+ result = (int)file_stat.f_frsize;
+ }
+#else
+ result == -1;
+#endif
+ return result;
+}
diff --git a/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java b/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java
index e2a65cbd426..23adf004e6d 100644
--- a/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java
@@ -30,6 +30,8 @@ import java.io.IOException;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.JavaIOFileDescriptorAccess;
import sun.security.action.GetPropertyAction;
+import java.io.File;
+import java.nio.CharBuffer;
class FileDispatcherImpl extends FileDispatcher {
@@ -123,6 +125,21 @@ class FileDispatcherImpl extends FileDispatcher {
return true;
}
+ int setDirectIO(FileDescriptor fd, String path)
+ {
+ int result = -1;
+ String filePath = path.substring(0, path.lastIndexOf(File.separator));
+ CharBuffer buffer = CharBuffer.allocate(filePath.length());
+ buffer.put(filePath);
+ try {
+ result = setDirect0(fd, buffer);
+ } catch (IOException e) {
+ throw new UnsupportedOperationException
+ ("Error setting up DirectIO", e);
+ }
+ return result;
+ }
+
static boolean isFastFileTransferRequested() {
String fileTransferProp = GetPropertyAction
.privilegedGetProperty("jdk.nio.enableFastFileTransfer");
@@ -177,4 +194,6 @@ class FileDispatcherImpl extends FileDispatcher {
static native void close0(FileDescriptor fd) throws IOException;
static native long duplicateHandle(long fd) throws IOException;
+
+ static native int setDirect0(FileDescriptor fd, CharBuffer buffer) throws IOException;
}
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
index 7af7132bfee..16d65c78a30 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,7 @@ class WindowsChannelFactory {
boolean overlapped;
boolean sync;
boolean dsync;
+ boolean direct;
// non-standard
boolean shareRead = true;
@@ -121,6 +122,10 @@ class WindowsChannelFactory {
flags.shareDelete = false;
continue;
}
+ if (ExtendedOptions.DIRECT.matches(option)) {
+ flags.direct = true;
+ continue;
+ }
if (option == null)
throw new NullPointerException();
throw new UnsupportedOperationException();
@@ -161,7 +166,8 @@ class WindowsChannelFactory {
throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed");
FileDescriptor fdObj = open(pathForWindows, pathToCheck, flags, pSecurityDescriptor);
- return FileChannelImpl.open(fdObj, pathForWindows, flags.read, flags.write, null);
+ return FileChannelImpl.open(fdObj, pathForWindows, flags.read,
+ flags.write, flags.direct, null);
}
/**
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
index 508e5d739a9..9e74c6ed107 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,7 @@ class WindowsFileStore
}
// read the free space info
- private DiskFreeSpace readDiskFreeSpace() throws IOException {
+ private DiskFreeSpace readDiskFreeSpaceEx() throws IOException {
try {
return GetDiskFreeSpaceEx(root);
} catch (WindowsException x) {
@@ -134,19 +134,32 @@ class WindowsFileStore
}
}
+ private DiskFreeSpace readDiskFreeSpace() throws IOException {
+ try {
+ return GetDiskFreeSpace(root);
+ } catch (WindowsException x) {
+ x.rethrowAsIOException(root);
+ return null;
+ }
+ }
+
@Override
public long getTotalSpace() throws IOException {
- return readDiskFreeSpace().totalNumberOfBytes();
+ return readDiskFreeSpaceEx().totalNumberOfBytes();
}
@Override
public long getUsableSpace() throws IOException {
- return readDiskFreeSpace().freeBytesAvailable();
+ return readDiskFreeSpaceEx().freeBytesAvailable();
+ }
+
+ public long getBlockSize() throws IOException {
+ return readDiskFreeSpace().bytesPerSector();
}
@Override
public long getUnallocatedSpace() throws IOException {
- return readDiskFreeSpace().freeBytesAvailable();
+ return readDiskFreeSpaceEx().freeBytesAvailable();
}
@Override
@@ -165,6 +178,8 @@ class WindowsFileStore
return getUsableSpace();
if (attribute.equals("unallocatedSpace"))
return getUnallocatedSpace();
+ if (attribute.equals("bytesPerSector"))
+ return getBlockSize();
// windows specific for testing purposes
if (attribute.equals("volume:vsn"))
return volInfo.volumeSerialNumber();
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
index db24742674f..96ab6ac30b9 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -485,21 +485,50 @@ class WindowsNativeDispatcher {
buffer.release();
}
}
+
+ /**
+ * GetDiskFreeSpace(
+ * LPCTSTR lpRootPathName,
+ * LPDWORD lpSectorsPerCluster,
+ * LPDWORD lpBytesPerSector,
+ * LPDWORD lpNumberOfFreeClusters,
+ * LPDWORD lpTotalNumberOfClusters
+ * )
+ */
+ static DiskFreeSpace GetDiskFreeSpace(String path)
+ throws WindowsException
+ {
+ NativeBuffer buffer = asNativeBuffer(path);
+ try {
+ DiskFreeSpace space = new DiskFreeSpace();
+ GetDiskFreeSpace0(buffer.address(), space);
+ return space;
+ } finally {
+ buffer.release();
+ }
+ }
+
static class DiskFreeSpace {
private long freeBytesAvailable;
private long totalNumberOfBytes;
private long totalNumberOfFreeBytes;
+ private long bytesPerSector;
private DiskFreeSpace() { }
public long freeBytesAvailable() { return freeBytesAvailable; }
public long totalNumberOfBytes() { return totalNumberOfBytes; }
public long totalNumberOfFreeBytes() { return totalNumberOfFreeBytes; }
+ public long bytesPerSector() { return bytesPerSector; }
}
private static native void GetDiskFreeSpaceEx0(long lpDirectoryName,
DiskFreeSpace obj)
throws WindowsException;
+ private static native void GetDiskFreeSpace0(long lpRootPathName,
+ DiskFreeSpace obj)
+ throws WindowsException;
+
/**
* GetVolumePathName(
* LPCTSTR lpszFileName,
diff --git a/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c
index bcacd698552..296ff597f63 100644
--- a/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c
+++ b/src/java.base/windows/native/libnio/ch/FileDispatcherImpl.c
@@ -456,3 +456,33 @@ Java_sun_nio_ch_FileDispatcherImpl_duplicateHandle(JNIEnv *env, jclass this, jlo
JNU_ThrowIOExceptionWithLastError(env, "DuplicateHandle failed");
return ptr_to_jlong(hResult);
}
+
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_FileDispatcherImpl_setDirect0(JNIEnv *env, jclass this,
+ jobject fdObj, jobject buffer)
+{
+ jint result = -1;
+
+ HANDLE orig = (HANDLE)(handleval(env, fdObj));
+
+ HANDLE modify = ReOpenFile(orig, 0, 0,
+ FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH);
+
+ if (modify != INVALID_HANDLE_VALUE) {
+ DWORD sectorsPerCluster;
+ DWORD bytesPerSector;
+ DWORD numberOfFreeClusters;
+ DWORD totalNumberOfClusters;
+ LPCWSTR lpRootPathName = (*env)->GetDirectBufferAddress(env, buffer);
+ BOOL res = GetDiskFreeSpaceW(lpRootPathName,
+ §orsPerCluster,
+ &bytesPerSector,
+ &numberOfFreeClusters,
+ &totalNumberOfClusters);
+ if (res == 0) {
+ JNU_ThrowIOExceptionWithLastError(env, "DirectIO setup failed");
+ }
+ result = bytesPerSector;
+ }
+ return result;
+}
diff --git a/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c b/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
index 18cb21dbd66..972f6b2df1b 100644
--- a/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
+++ b/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,8 @@ static jfieldID diskSpace_bytesAvailable;
static jfieldID diskSpace_totalBytes;
static jfieldID diskSpace_totalFree;
+static jfieldID diskSpace_bytesPerSector;
+
static jfieldID account_domain;
static jfieldID account_name;
static jfieldID account_use;
@@ -121,6 +123,8 @@ Java_sun_nio_fs_WindowsNativeDispatcher_initIDs(JNIEnv* env, jclass this)
CHECK_NULL(diskSpace_totalBytes);
diskSpace_totalFree = (*env)->GetFieldID(env, clazz, "totalNumberOfFreeBytes", "J");
CHECK_NULL(diskSpace_totalFree);
+ diskSpace_bytesPerSector = (*env)->GetFieldID(env, clazz, "bytesPerSector", "J");
+ CHECK_NULL(diskSpace_bytesPerSector);
clazz = (*env)->FindClass(env, "sun/nio/fs/WindowsNativeDispatcher$Account");
CHECK_NULL(clazz);
@@ -582,6 +586,30 @@ Java_sun_nio_fs_WindowsNativeDispatcher_GetDiskFreeSpaceEx0(JNIEnv* env, jclass
long_to_jlong(totalNumberOfFreeBytes.QuadPart));
}
+JNIEXPORT void JNICALL
+Java_sun_nio_fs_WindowsNativeDispatcher_GetDiskFreeSpace0(JNIEnv* env, jclass this,
+ jlong address, jobject obj)
+{
+ DWORD sectorsPerCluster;
+ DWORD bytesPerSector;
+ DWORD numberOfFreeClusters;
+ DWORD totalNumberOfClusters;
+ LPCWSTR lpRootPathName = jlong_to_ptr(address);
+
+
+ BOOL res = GetDiskFreeSpaceW(lpRootPathName,
+ §orsPerCluster,
+ &bytesPerSector,
+ &numberOfFreeClusters,
+ &totalNumberOfClusters);
+ if (res == 0) {
+ throwWindowsException(env, GetLastError());
+ return;
+ }
+
+ (*env)->SetLongField(env, obj, diskSpace_bytesPerSector,
+ long_to_jlong(bytesPerSector));
+}
JNIEXPORT jstring JNICALL
Java_sun_nio_fs_WindowsNativeDispatcher_GetVolumePathName0(JNIEnv* env, jclass this,
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
index 6edba8ea15f..7e8f070b442 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
@@ -75,7 +75,7 @@ public abstract class AbstractAnnotationValueVisitor6
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected AbstractAnnotationValueVisitor6() {}
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
index 7901f85d409..6e644d2a631 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
@@ -75,7 +75,7 @@ public abstract class AbstractElementVisitor6 implements ElementVisitor implements TypeVisitor {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected AbstractTypeVisitor6() {}
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
index 4913665bfa7..2aa646b428e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
@@ -91,7 +91,7 @@ public class ElementKindVisitor6
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected ElementKindVisitor6() {
super(null);
}
@@ -104,7 +104,7 @@ public class ElementKindVisitor6
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected ElementKindVisitor6(R defaultValue) {
super(defaultValue);
}
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
index 7140f8bd59d..f4ef050c20d 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -106,7 +106,7 @@ public class ElementScanner6 extends AbstractElementVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected ElementScanner6(){
DEFAULT_VALUE = null;
}
@@ -119,7 +119,7 @@ public class ElementScanner6 extends AbstractElementVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected ElementScanner6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
index 9d33023db95..e6ec0d15b81 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
@@ -92,7 +92,7 @@ public class SimpleAnnotationValueVisitor6
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleAnnotationValueVisitor6() {
super();
DEFAULT_VALUE = null;
@@ -106,7 +106,7 @@ public class SimpleAnnotationValueVisitor6
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleAnnotationValueVisitor6(R defaultValue) {
super();
DEFAULT_VALUE = defaultValue;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
index 8d20148b211..e7e97d0dd8b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
@@ -94,7 +94,7 @@ public class SimpleElementVisitor6 extends AbstractElementVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleElementVisitor6(){
DEFAULT_VALUE = null;
}
@@ -107,7 +107,7 @@ public class SimpleElementVisitor6 extends AbstractElementVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleElementVisitor6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
index b29062d5c8c..44d55c7bede 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
@@ -94,7 +94,7 @@ public class SimpleTypeVisitor6 extends AbstractTypeVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleTypeVisitor6(){
DEFAULT_VALUE = null;
}
@@ -107,7 +107,7 @@ public class SimpleTypeVisitor6 extends AbstractTypeVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected SimpleTypeVisitor6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
index 2270dd0d350..347779b4e10 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
@@ -85,7 +85,7 @@ public class TypeKindVisitor6 extends SimpleTypeVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected TypeKindVisitor6() {
super(null);
}
@@ -99,7 +99,7 @@ public class TypeKindVisitor6 extends SimpleTypeVisitor6 {
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
*/
- @Deprecated
+ @Deprecated(since="9")
protected TypeKindVisitor6(R defaultValue) {
super(defaultValue);
}
diff --git a/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
index 91203e18996..1c7d0455a1e 100644
--- a/src/java.compiler/share/classes/javax/tools/ToolProvider.java
+++ b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ public class ToolProvider {
* locate system tools as well as user-installed tools.
* @return a class loader, or {@code null}
*/
- @Deprecated
+ @Deprecated(since="9")
public static ClassLoader getSystemToolClassLoader() {
return null;
}
diff --git a/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
index b875d25cb32..62c0a62a227 100644
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
@@ -38,7 +38,10 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.DigestOutputStream;
import java.security.AccessController;
+import java.security.PermissionCollection;
+import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.lang.reflect.Modifier;
import java.lang.reflect.Field;
@@ -57,6 +60,8 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
import com.sun.corba.se.impl.util.RepositoryId;
@@ -443,6 +448,65 @@ public class ObjectStreamClass implements java.io.Serializable {
private static final PersistentFieldsValue persistentFieldsValue =
new PersistentFieldsValue();
+ /**
+ * Creates a PermissionDomain that grants no permission.
+ */
+ private ProtectionDomain noPermissionsDomain() {
+ PermissionCollection perms = new Permissions();
+ perms.setReadOnly();
+ return new ProtectionDomain(null, perms);
+ }
+
+ /**
+ * Aggregate the ProtectionDomains of all the classes that separate
+ * a concrete class {@code cl} from its ancestor's class declaring
+ * a constructor {@code cons}.
+ *
+ * If {@code cl} is defined by the boot loader, or the constructor
+ * {@code cons} is declared by {@code cl}, or if there is no security
+ * manager, then this method does nothing and {@code null} is returned.
+ *
+ * @param cons A constructor declared by {@code cl} or one of its
+ * ancestors.
+ * @param cl A concrete class, which is either the class declaring
+ * the constructor {@code cons}, or a serializable subclass
+ * of that class.
+ * @return An array of ProtectionDomain representing the set of
+ * ProtectionDomain that separate the concrete class {@code cl}
+ * from its ancestor's declaring {@code cons}, or {@code null}.
+ */
+ private ProtectionDomain[] getProtectionDomains(Constructor cons,
+ Class cl) {
+ ProtectionDomain[] domains = null;
+ if (cons != null && cl.getClassLoader() != null
+ && System.getSecurityManager() != null) {
+ Class cls = cl;
+ Class fnscl = cons.getDeclaringClass();
+ Set pds = null;
+ while (cls != fnscl) {
+ ProtectionDomain pd = cls.getProtectionDomain();
+ if (pd != null) {
+ if (pds == null) pds = new HashSet<>();
+ pds.add(pd);
+ }
+ cls = cls.getSuperclass();
+ if (cls == null) {
+ // that's not supposed to happen
+ // make a ProtectionDomain with no permission.
+ // should we throw instead?
+ if (pds == null) pds = new HashSet<>();
+ else pds.clear();
+ pds.add(noPermissionsDomain());
+ break;
+ }
+ }
+ if (pds != null) {
+ domains = pds.toArray(new ProtectionDomain[0]);
+ }
+ }
+ return domains;
+ }
+
/*
* Initialize class descriptor. This method is only invoked on class
* descriptors created via calls to lookupInternal(). This method is kept
@@ -568,11 +632,15 @@ public class ObjectStreamClass implements java.io.Serializable {
readResolveObjectMethod = bridge.readResolveForSerialization(cl);
+ domains = new ProtectionDomain[] {noPermissionsDomain()};
+
if (externalizable)
cons = getExternalizableConstructor(cl) ;
else
cons = getSerializableConstructor(cl) ;
+ domains = getProtectionDomains(cons, cl);
+
if (serializable && !forProxyClass) {
writeObjectMethod = bridge.writeObjectForSerialization(cl) ;
readObjectMethod = bridge.readObjectForSerialization(cl);
@@ -910,7 +978,7 @@ public class ObjectStreamClass implements java.io.Serializable {
{
if (cons != null) {
try {
- return cons.newInstance();
+ return bridge.newInstanceForSerialization(cons, domains);
} catch (IllegalAccessException ex) {
// should not occur, as access checks have been suppressed
InternalError ie = new InternalError();
@@ -1506,6 +1574,7 @@ public class ObjectStreamClass implements java.io.Serializable {
private transient MethodHandle writeReplaceObjectMethod;
private transient MethodHandle readResolveObjectMethod;
private transient Constructor cons;
+ private transient ProtectionDomain[] domains;
/**
* Beginning in Java to IDL ptc/02-01-12, RMI-IIOP has a
diff --git a/src/java.corba/share/classes/sun/corba/Bridge.java b/src/java.corba/share/classes/sun/corba/Bridge.java
index e22240e2a9f..38fb8da656c 100644
--- a/src/java.corba/share/classes/sun/corba/Bridge.java
+++ b/src/java.corba/share/classes/sun/corba/Bridge.java
@@ -27,8 +27,9 @@ package sun.corba ;
import java.io.OptionalDataException;
import java.lang.invoke.MethodHandle;
-import java.lang.reflect.Field ;
-import java.lang.reflect.Constructor ;
+import java.lang.reflect.Field;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.lang.StackWalker;
import java.lang.StackWalker.StackFrame;
import java.util.Optional;
@@ -37,6 +38,7 @@ import java.util.stream.Stream;
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import sun.misc.Unsafe;
import sun.reflect.ReflectionFactory;
@@ -340,6 +342,36 @@ public final class Bridge
return reflectionFactory.newConstructorForExternalization( cl ) ;
}
+ /**
+ * Invokes the supplied constructor, adding the provided protection domains
+ * to the invocation stack before invoking {@code Constructor::newInstance}.
+ *
+ * This is equivalent to calling
+ * {@code ReflectionFactory.newInstanceForSerialization(cons,domains)}.
+ *
+ * @param cons A constructor obtained from {@code
+ * newConstructorForSerialization} or {@code
+ * newConstructorForExternalization}.
+ *
+ * @param domains An array of protection domains that limit the privileges
+ * with which the constructor is invoked. Can be {@code null}
+ * or empty, in which case privileges are only limited by the
+ * {@linkplain AccessController#getContext() current context}.
+ *
+ * @return A new object built from the provided constructor.
+ *
+ * @throws NullPointerException if {@code cons} is {@code null}.
+ * @throws InstantiationException if thrown by {@code cons.newInstance()}.
+ * @throws InvocationTargetException if thrown by {@code cons.newInstance()}.
+ * @throws IllegalAccessException if thrown by {@code cons.newInstance()}.
+ */
+ public final Object newInstanceForSerialization(Constructor cons,
+ ProtectionDomain[] domains)
+ throws InstantiationException, InvocationTargetException, IllegalAccessException
+ {
+ return reflectionFactory.newInstanceForSerialization(cons, domains);
+ }
+
/**
* Returns true if the given class defines a static initializer method,
* false otherwise.
diff --git a/src/java.desktop/share/native/liblcms/cmscgats.c b/src/java.desktop/share/native/liblcms/cmscgats.c
index 9e033168f81..c4f4fb5d31a 100644
--- a/src/java.desktop/share/native/liblcms/cmscgats.c
+++ b/src/java.desktop/share/native/liblcms/cmscgats.c
@@ -900,7 +900,7 @@ void InSymbol(cmsIT8* it8)
k = 0;
NextCh(it8);
- while (k < MAXSTR && it8->ch != sng) {
+ while (k < (MAXSTR-1) && it8->ch != sng) {
if (it8->ch == '\n'|| it8->ch == '\r') k = MAXSTR+1;
else {
@@ -2053,14 +2053,18 @@ cmsBool HeaderSection(cmsIT8* it8)
static
void ReadType(cmsIT8* it8, char* SheetTypePtr)
{
+ cmsInt32Number cnt = 0;
+
// First line is a very special case.
while (isseparator(it8->ch))
NextCh(it8);
- while (it8->ch != '\r' && it8 ->ch != '\n' && it8->ch != '\t' && it8 -> ch != -1) {
+ while (it8->ch != '\r' && it8 ->ch != '\n' && it8->ch != '\t' && it8 -> ch != 0) {
*SheetTypePtr++= (char) it8 ->ch;
+ if (cnt++ < MAXSTR)
+ *SheetTypePtr++= (char) it8 ->ch;
NextCh(it8);
}
@@ -2253,7 +2257,7 @@ void CookPointers(cmsIT8* it8)
// that should be something like some printable characters plus a \n
// returns 0 if this is not like a CGATS, or an integer otherwise. This integer is the number of words in first line?
static
-int IsMyBlock(cmsUInt8Number* Buffer, int n)
+int IsMyBlock(const cmsUInt8Number* Buffer, int n)
{
int words = 1, space = 0, quot = 0;
int i;
@@ -2317,7 +2321,7 @@ cmsBool IsMyFile(const char* FileName)
// ---------------------------------------------------------- Exported routines
-cmsHANDLE CMSEXPORT cmsIT8LoadFromMem(cmsContext ContextID, void *Ptr, cmsUInt32Number len)
+cmsHANDLE CMSEXPORT cmsIT8LoadFromMem(cmsContext ContextID, const void *Ptr, cmsUInt32Number len)
{
cmsHANDLE hIT8;
cmsIT8* it8;
@@ -2326,7 +2330,7 @@ cmsHANDLE CMSEXPORT cmsIT8LoadFromMem(cmsContext ContextID, void *Ptr, cmsUInt3
_cmsAssert(Ptr != NULL);
_cmsAssert(len != 0);
- type = IsMyBlock((cmsUInt8Number*)Ptr, len);
+ type = IsMyBlock((const cmsUInt8Number*)Ptr, len);
if (type == 0) return NULL;
hIT8 = cmsIT8Alloc(ContextID);
diff --git a/src/java.desktop/share/native/liblcms/cmsnamed.c b/src/java.desktop/share/native/liblcms/cmsnamed.c
index 870936fddf6..d1edeb4ce12 100644
--- a/src/java.desktop/share/native/liblcms/cmsnamed.c
+++ b/src/java.desktop/share/native/liblcms/cmsnamed.c
@@ -546,7 +546,11 @@ cmsBool GrowNamedColorList(cmsNAMEDCOLORLIST* v)
size = v ->Allocated * 2;
// Keep a maximum color lists can grow, 100K entries seems reasonable
- if (size > 1024*100) return FALSE;
+ if (size > 1024 * 100) {
+ _cmsFree(v->ContextID, (void*) v->List);
+ v->List = NULL;
+ return FALSE;
+ }
NewPtr = (_cmsNAMEDCOLOR*) _cmsRealloc(v ->ContextID, v ->List, size * sizeof(_cmsNAMEDCOLOR));
if (NewPtr == NULL)
@@ -568,8 +572,11 @@ cmsNAMEDCOLORLIST* CMSEXPORT cmsAllocNamedColorList(cmsContext ContextID, cmsUIn
v ->nColors = 0;
v ->ContextID = ContextID;
- while (v -> Allocated < n){
- if (!GrowNamedColorList(v)) return NULL;
+ while (v -> Allocated < n) {
+ if (!GrowNamedColorList(v)) {
+ _cmsFree(ContextID, (void*) v);
+ return NULL;
+ }
}
strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix)-1);
diff --git a/src/java.desktop/share/native/liblcms/cmsopt.c b/src/java.desktop/share/native/liblcms/cmsopt.c
index d40993b083f..a3ff2fc10e3 100644
--- a/src/java.desktop/share/native/liblcms/cmsopt.c
+++ b/src/java.desktop/share/native/liblcms/cmsopt.c
@@ -1483,6 +1483,7 @@ cmsBool OptimizeByJoiningCurves(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUI
// LUT optimizes to nothing. Set the identity LUT
cmsStageFree(ObtainedCurves);
+ ObtainedCurves = NULL;
if (!cmsPipelineInsertStage(Dest, cmsAT_BEGIN, cmsStageAllocIdentity(Dest ->ContextID, Src ->InputChannels)))
goto Error;
diff --git a/src/java.desktop/share/native/liblcms/cmstypes.c b/src/java.desktop/share/native/liblcms/cmstypes.c
index 3f8999f23f6..ebf81c83b39 100644
--- a/src/java.desktop/share/native/liblcms/cmstypes.c
+++ b/src/java.desktop/share/native/liblcms/cmstypes.c
@@ -1489,6 +1489,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
// Check for overflow
if (Offset < (SizeOfHeader + 8)) goto Error;
+ if (((Offset + Len) < Len) || ((Offset + Len) > SizeOfTag + 8)) goto Error;
// True begin of the string
BeginOfThisString = Offset - SizeOfHeader - 8;
@@ -4460,18 +4461,19 @@ void *Type_MPE_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
NewLUT = cmsPipelineAlloc(self ->ContextID, InputChans, OutputChans);
if (NewLUT == NULL) return NULL;
- if (!_cmsReadUInt32Number(io, &ElementCount)) return NULL;
-
- if (!ReadPositionTable(self, io, ElementCount, BaseOffset, NewLUT, ReadMPEElem)) {
- if (NewLUT != NULL) cmsPipelineFree(NewLUT);
- *nItems = 0;
- return NULL;
- }
+ if (!_cmsReadUInt32Number(io, &ElementCount)) goto Error;
+ if (!ReadPositionTable(self, io, ElementCount, BaseOffset, NewLUT, ReadMPEElem)) goto Error;
// Success
*nItems = 1;
return NewLUT;
+ // Error
+Error:
+ if (NewLUT != NULL) cmsPipelineFree(NewLUT);
+ *nItems = 0;
+ return NULL;
+
cmsUNUSED_PARAMETER(SizeOfTag);
}
diff --git a/src/java.desktop/share/native/liblcms/lcms2.h b/src/java.desktop/share/native/liblcms/lcms2.h
index 9f148e54d1b..cbca89421a5 100644
--- a/src/java.desktop/share/native/liblcms/lcms2.h
+++ b/src/java.desktop/share/native/liblcms/lcms2.h
@@ -1836,7 +1836,7 @@ CMSAPI cmsInt32Number CMSEXPORT cmsIT8SetTable(cmsHANDLE hIT8, cmsUInt32Number
// Persistence
CMSAPI cmsHANDLE CMSEXPORT cmsIT8LoadFromFile(cmsContext ContextID, const char* cFileName);
-CMSAPI cmsHANDLE CMSEXPORT cmsIT8LoadFromMem(cmsContext ContextID, void *Ptr, cmsUInt32Number len);
+CMSAPI cmsHANDLE CMSEXPORT cmsIT8LoadFromMem(cmsContext ContextID, const void *Ptr, cmsUInt32Number len);
// CMSAPI cmsHANDLE CMSEXPORT cmsIT8LoadFromIOhandler(cmsContext ContextID, cmsIOHANDLER* io);
CMSAPI cmsBool CMSEXPORT cmsIT8SaveToFile(cmsHANDLE hIT8, const char* cFileName);
diff --git a/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp b/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp
index a71ede3d381..138f3e98075 100644
--- a/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp
@@ -61,29 +61,36 @@ INLINE void AwtCmdIDList::BuildFreeList(UINT first_index)
m_first_free = first_index; // head of the free list
}
+
+jboolean AwtCmdIDList::isFreeIDAvailable() {
+ CriticalSection::Lock l(m_lock);
+
+ if (m_first_free == -1) { // out of free ids
+ if (m_capacity == ARRAY_MAXIMUM_SIZE) {
+ return JNI_FALSE;
+ }
+ }
+ return JNI_TRUE;
+}
+
// Assign an id to the object. Recycle the first free entry from the
// head of the free list or allocate more memory for a new free list.
UINT AwtCmdIDList::Add(AwtObject* obj)
{
CriticalSection::Lock l(m_lock);
+ if (!isFreeIDAvailable()) {
+ throw std::bad_alloc(); // fatal error
+ }
if (m_first_free == -1) { // out of free ids
- if (m_capacity == ARRAY_MAXIMUM_SIZE) {
- // Really bad - out of ids. Since we hardly can have *so*
- // many items simultaneously in existence, we have an id
- // leak somewhere.
- DASSERT(FALSE);
- return 0;
- }
- else { // snarf a bigger arena
- UINT old_capacity = m_capacity; // will be the first free entry
- m_capacity += ARRAY_SIZE_INCREMENT;
- if (m_capacity > ARRAY_MAXIMUM_SIZE)
- m_capacity = ARRAY_MAXIMUM_SIZE;
- m_array = (CmdIDEntry *)SAFE_SIZE_ARRAY_REALLOC(safe_Realloc, m_array,
- m_capacity, sizeof(CmdIDEntry*));
- BuildFreeList(old_capacity);
- }
+ // snarf a bigger arena
+ UINT old_capacity = m_capacity; // will be the first free entry
+ m_capacity += ARRAY_SIZE_INCREMENT;
+ if (m_capacity > ARRAY_MAXIMUM_SIZE)
+ m_capacity = ARRAY_MAXIMUM_SIZE;
+ m_array = (CmdIDEntry *)SAFE_SIZE_ARRAY_REALLOC(safe_Realloc, m_array,
+ m_capacity, sizeof(CmdIDEntry*));
+ BuildFreeList(old_capacity);
}
DASSERT(m_first_free != -1);
diff --git a/src/java.desktop/windows/native/libawt/windows/CmdIDList.h b/src/java.desktop/windows/native/libawt/windows/CmdIDList.h
index 3677b6dcf04..15b032e625d 100644
--- a/src/java.desktop/windows/native/libawt/windows/CmdIDList.h
+++ b/src/java.desktop/windows/native/libawt/windows/CmdIDList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ public:
UINT Add(AwtObject* obj);
AwtObject* Lookup(UINT id);
void Remove(UINT id);
+ jboolean isFreeIDAvailable();
CriticalSection m_lock;
diff --git a/src/java.desktop/windows/native/libawt/windows/awt.h b/src/java.desktop/windows/native/libawt/windows/awt.h
index 1aae25a7219..5b6d121cd87 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt.h
@@ -57,15 +57,6 @@ typedef AwtObject* PDATA;
} \
}
-#define JNI_CHECK_PEER_GOTO(peer, where) { \
- JNI_CHECK_NULL_GOTO(peer, "peer", where); \
- pData = JNI_GET_PDATA(peer); \
- if (pData == NULL) { \
- THROW_NULL_PDATA_IF_NOT_DESTROYED(peer); \
- goto where; \
- } \
-}
-
#define JNI_CHECK_NULL_RETURN(obj, msg) { \
if (obj == NULL) { \
env->ExceptionClear(); \
@@ -74,15 +65,6 @@ typedef AwtObject* PDATA;
} \
}
-#define JNI_CHECK_PEER_RETURN(peer) { \
- JNI_CHECK_NULL_RETURN(peer, "peer"); \
- pData = JNI_GET_PDATA(peer); \
- if (pData == NULL) { \
- THROW_NULL_PDATA_IF_NOT_DESTROYED(peer); \
- return; \
- } \
-}
-
#define JNI_CHECK_PEER_CREATION_RETURN(peer) { \
if (peer == NULL ) { \
return; \
@@ -109,6 +91,33 @@ typedef AwtObject* PDATA;
} \
}
+/**
+ * This macros must be used under SyncCall or on the Toolkit thread.
+ */
+#define JNI_CHECK_PEER_GOTO(peer, where) { \
+ JNI_CHECK_NULL_GOTO(peer, "peer", where); \
+ pData = JNI_GET_PDATA(peer); \
+ if (pData == NULL) { \
+ THROW_NULL_PDATA_IF_NOT_DESTROYED(peer); \
+ goto where; \
+ } \
+}
+
+/**
+ * This macros must be used under SyncCall or on the Toolkit thread.
+ */
+#define JNI_CHECK_PEER_RETURN(peer) { \
+ JNI_CHECK_NULL_RETURN(peer, "peer"); \
+ pData = JNI_GET_PDATA(peer); \
+ if (pData == NULL) { \
+ THROW_NULL_PDATA_IF_NOT_DESTROYED(peer); \
+ return; \
+ } \
+}
+
+/**
+ * This macros must be used under SyncCall or on the Toolkit thread.
+ */
#define JNI_CHECK_PEER_RETURN_NULL(peer) { \
JNI_CHECK_NULL_RETURN_NULL(peer, "peer"); \
pData = JNI_GET_PDATA(peer); \
@@ -118,6 +127,9 @@ typedef AwtObject* PDATA;
} \
}
+/**
+ * This macros must be used under SyncCall or on the Toolkit thread.
+ */
#define JNI_CHECK_PEER_RETURN_VAL(peer, val) { \
JNI_CHECK_NULL_RETURN_VAL(peer, "peer", val); \
pData = JNI_GET_PDATA(peer); \
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
index e76582bf363..1a7a89fdef4 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
@@ -65,6 +65,7 @@ LPCTSTR AwtButton::GetClassName() {
/* Create a new AwtButton object and window. */
AwtButton* AwtButton::Create(jobject self, jobject parent)
{
+ DASSERT(AwtToolkit::IsMainThread());
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
/* the result */
@@ -88,7 +89,6 @@ AwtButton* AwtButton::Create(jobject self, jobject parent)
JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtCanvas*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "awtParent", done);
target = env->GetObjectField(self, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "target", done);
@@ -375,9 +375,6 @@ Java_sun_awt_windows_WButtonPeer_setLabel(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(self);
-
SetLabelStruct *sls = new SetLabelStruct;
sls->button = env->NewGlobalRef(self);
sls->label = (label != NULL) ? (jstring)env->NewGlobalRef(label) : NULL;
@@ -399,14 +396,9 @@ Java_sun_awt_windows_WButtonPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
-
AwtToolkit::CreateComponent(
self, parent, (AwtToolkit::ComponentFactory)AwtButton::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
-
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
index fba055cb498..a152b8ebbd7 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
@@ -59,6 +59,7 @@ LPCTSTR AwtCanvas::GetClassName() {
*/
AwtCanvas* AwtCanvas::Create(jobject self, jobject hParent)
{
+ DASSERT(AwtToolkit::IsMainThread());
TRY;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
@@ -74,12 +75,11 @@ AwtCanvas* AwtCanvas::Create(jobject self, jobject hParent)
return NULL;
}
+ PDATA pData;
AwtComponent* parent;
- JNI_CHECK_NULL_GOTO(hParent, "null hParent", done);
-
- parent = (AwtComponent*)JNI_GET_PDATA(hParent);
- JNI_CHECK_NULL_GOTO(parent, "null parent", done);
+ JNI_CHECK_PEER_GOTO(hParent, done);
+ parent = (AwtCanvas*)pData;
target = env->GetObjectField(self, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
@@ -236,12 +236,9 @@ Java_sun_awt_windows_WCanvasPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtCanvas::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
index 8e18d79eaa1..d77ebb74a3e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
@@ -70,6 +70,7 @@ LPCTSTR AwtCheckbox::GetClassName() {
AwtCheckbox* AwtCheckbox::Create(jobject peer, jobject parent)
{
+ DASSERT(AwtToolkit::IsMainThread());
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jstring label = NULL;
@@ -81,11 +82,10 @@ AwtCheckbox* AwtCheckbox::Create(jobject peer, jobject parent)
return NULL;
}
+ PDATA pData;
AwtComponent* awtParent;
- JNI_CHECK_NULL_GOTO(parent, "null parent", done);
-
- awtParent = (AwtComponent*)JNI_GET_PDATA(parent);
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
+ JNI_CHECK_PEER_GOTO(parent, done);
+ awtParent = (AwtCanvas*)pData;
target = env->GetObjectField(peer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
@@ -669,11 +669,10 @@ Java_sun_awt_windows_WCheckboxPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtCheckbox::Create);
+ PDATA pData;
JNI_CHECK_PEER_CREATION_RETURN(self);
#ifdef DEBUG
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp
index 8376f0abc2b..bfdf76f272c 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp
@@ -104,7 +104,7 @@ void AwtChoice::Dispose() {
}
AwtChoice* AwtChoice::Create(jobject peer, jobject parent) {
-
+ DASSERT(AwtToolkit::IsMainThread());
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jobject target = NULL;
@@ -115,12 +115,10 @@ AwtChoice* AwtChoice::Create(jobject peer, jobject parent) {
if (env->EnsureLocalCapacity(1) < 0) {
return NULL;
}
+ PDATA pData;
AwtCanvas* awtParent;
-
- JNI_CHECK_NULL_GOTO(parent, "null parent", done);
-
- awtParent = (AwtCanvas*)JNI_GET_PDATA(parent);
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
+ JNI_CHECK_PEER_GOTO(parent, done);
+ awtParent = (AwtCanvas*)pData;
target = env->GetObjectField(peer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
@@ -830,12 +828,9 @@ Java_sun_awt_windows_WChoicePeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtChoice::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
index 8eb09ff3173..eb5c20ef286 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
@@ -151,6 +151,11 @@ struct SetFocusStruct {
jobject component;
jboolean doSetFocus;
};
+// Struct for _SetParent function
+struct SetParentStruct {
+ jobject component;
+ jobject parentComp;
+};
/************************************************************************/
//////////////////////////////////////////////////////////////////////////
@@ -269,9 +274,6 @@ AwtComponent::~AwtComponent()
{
DASSERT(AwtToolkit::IsMainThread());
- /* Disconnect all links. */
- UnlinkObjects();
-
/*
* All the messages for this component are processed, native
* resources are freed, and Java object is not connected to
@@ -283,6 +285,8 @@ AwtComponent::~AwtComponent()
void AwtComponent::Dispose()
{
+ DASSERT(AwtToolkit::IsMainThread());
+
// NOTE: in case the component/toplevel was focused, Java should
// have already taken care of proper transferring it or clearing.
@@ -301,8 +305,10 @@ void AwtComponent::Dispose()
/* Release global ref to input method */
SetInputMethod(NULL, TRUE);
- if (m_childList != NULL)
+ if (m_childList != NULL) {
delete m_childList;
+ m_childList = NULL;
+ }
DestroyDropTarget();
ReleaseDragCapture(0);
@@ -325,6 +331,9 @@ void AwtComponent::Dispose()
m_brushBackground = NULL;
}
+ /* Disconnect all links. */
+ UnlinkObjects();
+
if (m_bPauseDestroy) {
// AwtComponent::WmNcDestroy could be released now
m_bPauseDestroy = FALSE;
@@ -6288,21 +6297,36 @@ ret:
return result;
}
-void AwtComponent::SetParent(void * param) {
+void AwtComponent::_SetParent(void * param)
+{
if (AwtToolkit::IsMainThread()) {
- AwtComponent** comps = (AwtComponent**)param;
- if ((comps[0] != NULL) && (comps[1] != NULL)) {
- HWND selfWnd = comps[0]->GetHWnd();
- HWND parentWnd = comps[1]->GetHWnd();
- if (::IsWindow(selfWnd) && ::IsWindow(parentWnd)) {
- // Shouldn't trigger native focus change
- // (only the proxy may be the native focus owner).
- ::SetParent(selfWnd, parentWnd);
- }
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ SetParentStruct *data = (SetParentStruct*) param;
+ jobject self = data->component;
+ jobject parent = data->parentComp;
+
+ AwtComponent *awtComponent = NULL;
+ AwtComponent *awtParent = NULL;
+
+ PDATA pData;
+ JNI_CHECK_PEER_GOTO(self, ret);
+ awtComponent = (AwtComponent *)pData;
+ JNI_CHECK_PEER_GOTO(parent, ret);
+ awtParent = (AwtComponent *)pData;
+
+ HWND selfWnd = awtComponent->GetHWnd();
+ HWND parentWnd = awtParent->GetHWnd();
+ if (::IsWindow(selfWnd) && ::IsWindow(parentWnd)) {
+ // Shouldn't trigger native focus change
+ // (only the proxy may be the native focus owner).
+ ::SetParent(selfWnd, parentWnd);
}
- delete[] comps;
+ret:
+ env->DeleteGlobalRef(self);
+ env->DeleteGlobalRef(parent);
+ delete data;
} else {
- AwtToolkit::GetInstance().InvokeFunction(AwtComponent::SetParent, param);
+ AwtToolkit::GetInstance().InvokeFunction(AwtComponent::_SetParent, param);
}
}
@@ -7129,15 +7153,12 @@ JNIEXPORT void JNICALL
Java_sun_awt_windows_WComponentPeer_pSetParent(JNIEnv* env, jobject self, jobject parent) {
TRY;
- typedef AwtComponent* PComponent;
- AwtComponent** comps = new PComponent[2];
- AwtComponent* comp = (AwtComponent*)JNI_GET_PDATA(self);
- AwtComponent* parentComp = (AwtComponent*)JNI_GET_PDATA(parent);
- comps[0] = comp;
- comps[1] = parentComp;
+ SetParentStruct * data = new SetParentStruct;
+ data->component = env->NewGlobalRef(self);
+ data->parentComp = env->NewGlobalRef(parent);
- AwtToolkit::GetInstance().SyncCall(AwtComponent::SetParent, comps);
- // comps is deleted in SetParent
+ AwtToolkit::GetInstance().SyncCall(AwtComponent::_SetParent, data);
+ // global refs and data are deleted in SetParent
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Component.h b/src/java.desktop/windows/native/libawt/windows/awt_Component.h
index 0bf23a596c2..69006d4993e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.h
@@ -672,6 +672,7 @@ public:
static void _RemoveNativeDropTarget(void *param);
static jintArray _CreatePrintedPixels(void *param);
static jboolean _NativeHandlesWheelScrolling(void *param);
+ static void _SetParent(void * param);
static void _SetRectangularShape(void *param);
static void _SetZOrder(void *param);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp
index e3413714b62..47b80a4ea04 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp
@@ -111,12 +111,13 @@ AwtDialog* AwtDialog::Create(jobject peer, jobject parent)
PDATA pData;
AwtWindow* awtParent = NULL;
HWND hwndParent = NULL;
+
target = env->GetObjectField(peer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
if (parent != NULL) {
JNI_CHECK_PEER_GOTO(parent, done);
- awtParent = (AwtWindow *)(JNI_GET_PDATA(parent));
+ awtParent = (AwtWindow *)pData;
hwndParent = awtParent->GetHWnd();
} else {
// There is no way to prevent a parentless dialog from showing on
@@ -775,11 +776,9 @@ Java_sun_awt_windows_WDialogPeer_createAwtDialog(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtDialog::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp b/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
index 7b2d703bb6a..f5ce9015d04 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
@@ -691,7 +691,7 @@ Java_sun_awt_windows_WFileDialogPeer_getLocationOnScreen(JNIEnv *env,
jobject peerRef = env->NewGlobalRef(peer);
jobject resultRef = (jobject)AwtToolkit::GetInstance().SyncCall(
(void*(*)(void*))AwtFileDialog::_GetLocationOnScreen, (void *)peerRef);
- env->DeleteLocalRef(peerRef);
+ env->DeleteGlobalRef(peerRef);
if (resultRef != NULL)
{
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp
index b7e63628c2a..dc64430b195 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp
@@ -878,11 +878,16 @@ Java_sun_awt_windows_WFontMetrics_charsWidth(JNIEnv *env, jobject self,
if (str == NULL) {
JNU_ThrowNullPointerException(env, "str argument");
- return NULL;
+ return 0;
}
- if ((len < 0) || (off < 0) || (len + off > (env->GetArrayLength(str)))) {
+ if ((len < 0) || (off < 0) || (len + off < 0) ||
+ (len + off > (env->GetArrayLength(str)))) {
JNU_ThrowArrayIndexOutOfBoundsException(env, "off/len argument");
- return NULL;
+ return 0;
+ }
+
+ if (off == env->GetArrayLength(str)) {
+ return 0;
}
jchar *strp = new jchar[len];
@@ -914,12 +919,18 @@ Java_sun_awt_windows_WFontMetrics_bytesWidth(JNIEnv *env, jobject self,
if (str == NULL) {
JNU_ThrowNullPointerException(env, "bytes argument");
- return NULL;
+ return 0;
}
- if ((len < 0) || (off < 0) || (len + off > (env->GetArrayLength(str)))) {
+ if ((len < 0) || (off < 0) || (len + off < 0) ||
+ (len + off > (env->GetArrayLength(str)))) {
JNU_ThrowArrayIndexOutOfBoundsException(env, "off or len argument");
- return NULL;
+ return 0;
}
+
+ if (off == env->GetArrayLength(str)) {
+ return 0;
+ }
+
char *pStrBody = NULL;
jint result = 0;
try {
@@ -927,12 +938,12 @@ Java_sun_awt_windows_WFontMetrics_bytesWidth(JNIEnv *env, jobject self,
AwtFont::widthsID);
if (array == NULL) {
JNU_ThrowNullPointerException(env, "Can't access widths array.");
- return NULL;
+ return 0;
}
pStrBody = (char *)env->GetPrimitiveArrayCritical(str, 0);
if (pStrBody == NULL) {
JNU_ThrowNullPointerException(env, "Can't access str bytes.");
- return NULL;
+ return 0;
}
char *pStr = pStrBody + off;
@@ -942,7 +953,7 @@ Java_sun_awt_windows_WFontMetrics_bytesWidth(JNIEnv *env, jobject self,
if (widths == NULL) {
env->ReleasePrimitiveArrayCritical(str, pStrBody, 0);
JNU_ThrowNullPointerException(env, "Can't access widths.");
- return NULL;
+ return 0;
}
for (; len; len--) {
result += widths[*pStr++];
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
index 9bc6366d17b..788ece47354 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
@@ -1580,12 +1580,12 @@ void AwtFrame::_NotifyModalBlocked(void *param)
PDATA pData;
- pData = JNI_GET_PDATA(peer);
+ JNI_CHECK_PEER_GOTO(peer, ret);
AwtFrame *f = (AwtFrame *)pData;
// dialog here may be NULL, for example, if the blocker is a native dialog
// however, we need to install/unistall modal hooks anyway
- pData = JNI_GET_PDATA(blockerPeer);
+ JNI_CHECK_PEER_GOTO(blockerPeer, ret);
AwtDialog *d = (AwtDialog *)pData;
if ((f != NULL) && ::IsWindow(f->GetHWnd()))
@@ -1637,7 +1637,7 @@ void AwtFrame::_NotifyModalBlocked(void *param)
}
}
}
-
+ret:
env->DeleteGlobalRef(self);
env->DeleteGlobalRef(peer);
env->DeleteGlobalRef(blockerPeer);
@@ -1809,8 +1809,6 @@ Java_sun_awt_windows_WFramePeer_createAwtFrame(JNIEnv *env, jobject self,
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtFrame::Create);
- PDATA pData;
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
@@ -1924,8 +1922,6 @@ Java_sun_awt_windows_WEmbeddedFramePeer_create(JNIEnv *env, jobject self,
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtFrame::Create);
- PDATA pData;
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp
index 722151cd864..4f43e0e3d09 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp
@@ -80,7 +80,7 @@ AwtLabel* AwtLabel::Create(jobject labelPeer, jobject parent)
JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtCanvas*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "awtParent", done);
+
target = env->GetObjectField(labelPeer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "target", done);
@@ -392,12 +392,9 @@ Java_sun_awt_windows_WLabelPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtLabel::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_List.cpp b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
index 4c32a472996..071ab2a0ded 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
@@ -89,10 +89,9 @@ AwtList* AwtList::Create(jobject peer, jobject parent)
PDATA pData;
AwtCanvas* awtParent;
- JNI_CHECK_PEER_GOTO(parent, done);
+ JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtCanvas*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
/* target is Hjava_awt_List * */
target = env->GetObjectField(peer, AwtObject::targetID);
@@ -928,9 +927,6 @@ Java_sun_awt_windows_WListPeer_deselect(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(self);
-
SelectElementStruct *ses = new SelectElementStruct;
ses->list = env->NewGlobalRef(self);
ses->index = pos;
@@ -994,11 +990,8 @@ Java_sun_awt_windows_WListPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)AwtList::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
index f00d5ba31c7..095db63eb3d 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -217,6 +217,10 @@ AwtMenuItem* AwtMenuItem::Create(jobject peer, jobject menuPeer)
if (env->EnsureLocalCapacity(1) < 0) {
return NULL;
}
+ if (!AwtToolkit::GetInstance().isFreeIDAvailable()) {
+ return NULL;
+ }
+
JNI_CHECK_NULL_RETURN_NULL(menuPeer, "peer");
/* target is a java.awt.MenuItem */
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
index 04f463e642c..7e351e134b7 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
@@ -96,10 +96,9 @@ AwtScrollPane* AwtScrollPane::Create(jobject self, jobject parent)
PDATA pData;
AwtComponent* awtParent;
- JNI_CHECK_PEER_GOTO(parent, done);
+ JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtComponent*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
target = env->GetObjectField(self, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
@@ -679,11 +678,10 @@ Java_sun_awt_windows_WScrollPanePeer_create(JNIEnv *env, jobject self,
DTRACE_PRINTLN2("%x: WScrollPanePeer.create(%x)", self, parent);
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtScrollPane::Create);
+ PDATA pData;
JNI_CHECK_PEER_CREATION_RETURN(self);
((AwtScrollPane*)pData)->VerifyState();
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp
index 1e58f2ceb8d..502b9a0d236 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp
@@ -38,7 +38,11 @@ struct SetValuesStruct {
jint value;
jint visible;
jint min, max;
-
+};
+// struct for _SetLineIncrement()/_SetPageIncrement() methods
+struct SetIncrementStruct {
+ jobject scrollbar;
+ jint increment;
};
/************************************************************************
* AwtScrollbar fields
@@ -108,10 +112,9 @@ AwtScrollbar::Create(jobject peer, jobject parent)
PDATA pData;
AwtCanvas* awtParent;
- JNI_CHECK_PEER_GOTO(parent, done);
+ JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtCanvas*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
target = env->GetObjectField(peer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
@@ -471,6 +474,52 @@ ret:
delete svs;
}
+void AwtScrollbar::_SetLineIncrement(void *param)
+{
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+
+ SetIncrementStruct *sis = (SetIncrementStruct *)param;
+ jobject self = sis->scrollbar;
+ jint increment = sis->increment;
+
+ AwtScrollbar *sb = NULL;
+
+ PDATA pData;
+ JNI_CHECK_PEER_GOTO(self, ret);
+ sb = (AwtScrollbar *)pData;
+ if (::IsWindow(sb->GetHWnd()))
+ {
+ sb->SetLineIncrement(increment);
+ }
+ret:
+ env->DeleteGlobalRef(self);
+
+ delete sis;
+}
+
+void AwtScrollbar::_SetPageIncrement(void *param)
+{
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+
+ SetIncrementStruct *sis = (SetIncrementStruct *)param;
+ jobject self = sis->scrollbar;
+ jint increment = sis->increment;
+
+ AwtScrollbar *sb = NULL;
+
+ PDATA pData;
+ JNI_CHECK_PEER_GOTO(self, ret);
+ sb = (AwtScrollbar *)pData;
+ if (::IsWindow(sb->GetHWnd()))
+ {
+ sb->SetPageIncrement(increment);
+ }
+ret:
+ env->DeleteGlobalRef(self);
+
+ delete sis;
+}
+
/************************************************************************
* Scrollbar native methods
*/
@@ -546,10 +595,12 @@ Java_sun_awt_windows_WScrollbarPeer_setLineIncrement(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(self);
- AwtScrollbar* c = (AwtScrollbar*)pData;
- c->SetLineIncrement(increment);
+ SetIncrementStruct *sis = new SetIncrementStruct;
+ sis->scrollbar = env->NewGlobalRef(self);
+ sis->increment = increment;
+
+ AwtToolkit::GetInstance().SyncCall(AwtScrollbar::_SetLineIncrement, sis);
+ // global ref and svs are deleted in _SetValues
CATCH_BAD_ALLOC;
}
@@ -565,10 +616,12 @@ Java_sun_awt_windows_WScrollbarPeer_setPageIncrement(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(self);
- AwtScrollbar* c = (AwtScrollbar*)pData;
- c->SetPageIncrement(increment);
+ SetIncrementStruct *sis = new SetIncrementStruct;
+ sis->scrollbar = env->NewGlobalRef(self);
+ sis->increment = increment;
+
+ AwtToolkit::GetInstance().SyncCall(AwtScrollbar::_SetPageIncrement, sis);
+ // global ref and svs are deleted in _SetValues
CATCH_BAD_ALLOC;
}
@@ -584,12 +637,9 @@ Java_sun_awt_windows_WScrollbarPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtScrollbar::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h
index 2a6b03a6714..9369cab0e58 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h
@@ -77,6 +77,8 @@ public:
INLINE virtual BOOL IsScrollbar() { return TRUE; }
+ static void _SetLineIncrement(void *param);
+ static void _SetPageIncrement(void *param);
// invoked on Toolkit thread
static void _SetValues(void *param);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp
index cd40b1f237f..6dc21c5adda 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp
@@ -505,12 +505,9 @@ Java_sun_awt_windows_WTextAreaPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtTextArea::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
index de60f0ed702..38272959d73 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
@@ -95,10 +95,9 @@ AwtTextComponent* AwtTextComponent::Create(jobject peer, jobject parent, BOOL is
PDATA pData;
AwtCanvas* awtParent;
- JNI_CHECK_PEER_GOTO(parent, done);
+ JNI_CHECK_PEER_GOTO(parent, done);
awtParent = (AwtCanvas*)pData;
- JNI_CHECK_NULL_GOTO(awtParent, "null awtParent", done);
target = env->GetObjectField(peer, AwtObject::targetID);
JNI_CHECK_NULL_GOTO(target, "null target", done);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp
index 01c73f068ee..5518ab91145 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp
@@ -260,12 +260,9 @@ Java_sun_awt_windows_WTextFieldPeer_create(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
- JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtTextField::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
index db5745ea297..bf0122ab6f3 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1869,6 +1869,11 @@ void AwtToolkit::SyncCall(void (*ftn)(void)) {
}
}
+jboolean AwtToolkit::isFreeIDAvailable()
+{
+ return m_cmdIDs->isFreeIDAvailable();
+}
+
UINT AwtToolkit::CreateCmdID(AwtObject* object)
{
return m_cmdIDs->Add(object);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
index 778132ccf11..b22f685b2b3 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -373,6 +373,8 @@ public:
BOOL PreProcessMouseMsg(class AwtComponent* p, MSG& msg);
BOOL PreProcessKeyMsg(class AwtComponent* p, MSG& msg);
+ /* Checks that an free ID exists. */
+ jboolean isFreeIDAvailable();
/* Create an ID which maps to an AwtObject pointer, such as a menu. */
UINT CreateCmdID(AwtObject* object);
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
index 56f2bfdd0ea..b1cb6ad2ce9 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
@@ -3400,12 +3400,9 @@ Java_sun_awt_windows_WWindowPeer_createAwtWindow(JNIEnv *env, jobject self,
{
TRY;
- PDATA pData;
-// JNI_CHECK_PEER_RETURN(parent);
AwtToolkit::CreateComponent(self, parent,
(AwtToolkit::ComponentFactory)
AwtWindow::Create);
- JNI_CHECK_PEER_CREATION_RETURN(self);
CATCH_BAD_ALLOC;
}
diff --git a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java
index cd292850a2b..333c8f4a735 100644
--- a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java
+++ b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package com.sun.jmx.remote.internal.rmi;
+import java.io.ObjectInputFilter;
import java.rmi.NoSuchObjectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -51,7 +52,8 @@ public interface RMIExporter {
public Remote exportObject(Remote obj,
int port,
RMIClientSocketFactory csf,
- RMIServerSocketFactory ssf)
+ RMIServerSocketFactory ssf,
+ ObjectInputFilter filter)
throws RemoteException;
public boolean unexportObject(Remote obj, boolean force)
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
index a71bef5b403..0cda57065f7 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
@@ -32,6 +32,7 @@ import com.sun.jmx.remote.util.EnvHelp;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectInputFilter;
import java.io.ObjectOutputStream;
import java.net.MalformedURLException;
import java.rmi.server.RMIClientSocketFactory;
@@ -101,19 +102,59 @@ public class RMIConnectorServer extends JMXConnectorServer {
"jmx.remote.rmi.server.socket.factory";
/**
- * Name of the attribute that specifies a list of class names acceptable
- * as parameters to the {@link RMIServer#newClient(java.lang.Object) RMIServer.newClient()}
+ * Name of the attribute that specifies an
+ * {@link ObjectInputFilter} pattern string to filter classes acceptable
+ * for {@link RMIServer#newClient(java.lang.Object) RMIServer.newClient()}
* remote method call.
*
- * This list of classes should correspond to the transitive closure of the
- * credentials class (or classes) used by the installed {@linkplain JMXAuthenticator}
- * associated with the {@linkplain RMIServer} implementation.
+ * The filter pattern must be in same format as used in
+ * {@link java.io.ObjectInputFilter.Config#createFilter}
*
- * If the attribute is not set, or is null, then any class is
- * deemed acceptable.
+ * This list of classes allowed by filter should correspond to the
+ * transitive closure of the credentials class (or classes) used by the
+ * installed {@linkplain JMXAuthenticator} associated with the
+ * {@linkplain RMIServer} implementation.
+ * If the attribute is not set then any class is deemed acceptable.
+ * @see ObjectInputFilter
*/
- public static final String CREDENTIAL_TYPES =
- "jmx.remote.rmi.server.credential.types";
+ public static final String CREDENTIALS_FILTER_PATTERN =
+ "jmx.remote.rmi.server.credentials.filter.pattern";
+
+ /**
+ * This attribute defines a pattern from which to create a
+ * {@link java.io.ObjectInputFilter} that will be used when deserializing
+ * objects sent to the {@code JMXConnectorServer} by any client.
+ *
+ * The filter will be called for any class found in the serialized
+ * stream sent to server by client, including all JMX defined classes
+ * (such as {@link javax.management.ObjectName}), all method parameters,
+ * and, if present in the stream, all classes transitively referred by
+ * the serial form of any deserialized object.
+ * The pattern must be in same format as used in
+ * {@link java.io.ObjectInputFilter.Config#createFilter}.
+ * It may define a white list of permitted classes, a black list of
+ * rejected classes, a maximum depth for the deserialized objects,
+ * etc.
+ *
+ * To be functional, the filter should allow at least all the
+ * concrete types in the transitive closure of all objects that
+ * might get serialized when serializing all JMX classes referred
+ * as parameters in the {@link
+ * javax.management.remote.rmi.RMIConnection} interface,
+ * plus all classes that a {@link javax.management.remote.rmi.RMIConnector client}
+ * might need to transmit wrapped in {@linkplain java.rmi.MarshalledObject
+ * marshalled objects} in order to interoperate with the MBeans registered
+ * in the {@code MBeanServer}. That would potentially include all the
+ * concrete {@linkplain javax.management.openmbean JMX OpenTypes} and the
+ * classes they use in their serial form.
+ *
+ * Care must be taken when defining such a filter, as defining
+ * a white list too restrictive or a too wide a black list may
+ * prevent legitimate clients from interoperating with the
+ * {@code JMXConnectorServer}.
+ */
+ public static final String SERIAL_FILTER_PATTERN =
+ "jmx.remote.rmi.server.serial.filter.pattern";
/**
*
Makes an RMIConnectorServer.
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
index 8bcbe1919ad..e6787692ee7 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
@@ -26,6 +26,7 @@
package javax.management.remote.rmi;
import java.io.IOException;
+import java.io.ObjectInputFilter;
import java.rmi.NoSuchObjectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -39,15 +40,13 @@ import javax.security.auth.Subject;
import com.sun.jmx.remote.internal.rmi.RMIExporter;
import com.sun.jmx.remote.util.EnvHelp;
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
import sun.reflect.misc.ReflectUtil;
-import sun.rmi.server.DeserializationChecker;
import sun.rmi.server.UnicastServerRef;
import sun.rmi.server.UnicastServerRef2;
+import sun.rmi.transport.LiveRef;
/**
*
An {@link RMIServer} object that is exported through JRMP and that
@@ -60,8 +59,6 @@ import sun.rmi.server.UnicastServerRef2;
*/
public class RMIJRMPServerImpl extends RMIServerImpl {
- private final ExportedWrapper exportedWrapper;
-
/**
*
Creates a new {@link RMIServer} object that will be exported
* on the given port using the given socket factories.
@@ -100,33 +97,48 @@ public class RMIJRMPServerImpl extends RMIServerImpl {
this.ssf = ssf;
this.env = (env == null) ? Collections.emptyMap() : env;
+ // This attribute was represented by RMIConnectorServer.CREDENTIALS_TYPES.
+ // This attribute is superceded by
+ // RMIConnectorServer.CREDENTIALS_FILTER_PATTERN.
+ // Retaining this for backward compatibility.
String[] credentialsTypes
- = (String[]) this.env.get(RMIConnectorServer.CREDENTIAL_TYPES);
- List types = null;
- if (credentialsTypes != null) {
- types = new ArrayList<>();
- for (String type : credentialsTypes) {
- if (type == null) {
- throw new IllegalArgumentException("A credential type is null.");
- }
- ReflectUtil.checkPackageAccess(type);
- types.add(type);
- }
+ = (String[]) this.env.get("jmx.remote.rmi.server.credential.types");
+
+ String credentialsFilter
+ = (String) this.env.get(RMIConnectorServer.CREDENTIALS_FILTER_PATTERN);
+
+ // It is impossible for both attributes to be specified
+ if(credentialsTypes != null && credentialsFilter != null)
+ throw new IllegalArgumentException("Cannot specify both \""
+ + "jmx.remote.rmi.server.credential.types" + "\" and \""
+ + RMIConnectorServer.CREDENTIALS_FILTER_PATTERN + "\"");
+ else if(credentialsFilter != null){
+ cFilter = ObjectInputFilter.Config.createFilter(credentialsFilter);
+ allowedTypes = null;
}
- exportedWrapper = types != null ?
- new ExportedWrapper(this, types) :
- null;
+ else if (credentialsTypes != null) {
+ allowedTypes = Arrays.stream(credentialsTypes).filter(
+ s -> s!= null).collect(Collectors.toSet());
+ allowedTypes.stream().forEach(ReflectUtil::checkPackageAccess);
+ cFilter = this::newClientCheckInput;
+ } else {
+ allowedTypes = null;
+ cFilter = null;
+ }
+
+ String userJmxFilter =
+ (String) this.env.get(RMIConnectorServer.SERIAL_FILTER_PATTERN);
+ if(userJmxFilter != null && !userJmxFilter.isEmpty())
+ jmxRmiFilter = ObjectInputFilter.Config.createFilter(userJmxFilter);
+ else
+ jmxRmiFilter = null;
}
protected void export() throws IOException {
- if (exportedWrapper != null) {
- export(exportedWrapper);
- } else {
- export(this);
- }
+ export(this, cFilter);
}
- private void export(Remote obj) throws RemoteException {
+ private void export(Remote obj, ObjectInputFilter typeFilter) throws RemoteException {
final RMIExporter exporter =
(RMIExporter) env.get(RMIExporter.EXPORTER_ATTRIBUTE);
final boolean daemon = EnvHelp.isServerDaemon(env);
@@ -137,16 +149,14 @@ public class RMIJRMPServerImpl extends RMIServerImpl {
" cannot be used to specify an exporter!");
}
- if (daemon) {
- if (csf == null && ssf == null) {
- new UnicastServerRef(port).exportObject(obj, null, true);
- } else {
- new UnicastServerRef2(port, csf, ssf).exportObject(obj, null, true);
- }
- } else if (exporter != null) {
- exporter.exportObject(obj, port, csf, ssf);
+ if (exporter != null) {
+ exporter.exportObject(obj, port, csf, ssf, typeFilter);
} else {
- UnicastRemoteObject.exportObject(obj, port, csf, ssf);
+ if (csf == null && ssf == null) {
+ new UnicastServerRef(new LiveRef(port), typeFilter).exportObject(obj, null, daemon);
+ } else {
+ new UnicastServerRef2(port, csf, ssf, typeFilter).exportObject(obj, null, daemon);
+ }
}
}
@@ -173,11 +183,7 @@ public class RMIJRMPServerImpl extends RMIServerImpl {
* RMIJRMPServerImpl has not been exported yet.
*/
public Remote toStub() throws IOException {
- if (exportedWrapper != null) {
- return RemoteObject.toStub(exportedWrapper);
- } else {
- return RemoteObject.toStub(this);
- }
+ return RemoteObject.toStub(this);
}
/**
@@ -207,7 +213,7 @@ public class RMIJRMPServerImpl extends RMIServerImpl {
RMIConnection client =
new RMIConnectionImpl(this, connectionId, getDefaultClassLoader(),
subject, env);
- export(client);
+ export(client, jmxRmiFilter);
return client;
}
@@ -224,56 +230,39 @@ public class RMIJRMPServerImpl extends RMIServerImpl {
* server failed.
*/
protected void closeServer() throws IOException {
- if (exportedWrapper != null) {
- unexport(exportedWrapper, true);
- } else {
- unexport(this, true);
+ unexport(this, true);
+ }
+
+ /**
+ * Check that a type in the remote invocation of {@link RMIServerImpl#newClient}
+ * is one of the {@code allowedTypes}.
+ *
+ * @param clazz the class; may be null
+ * @param size the size for arrays, otherwise is 0
+ * @param nObjectRefs the current number of object references
+ * @param depth the current depth
+ * @param streamBytes the current number of bytes consumed
+ * @return {@code ObjectInputFilter.Status.ALLOWED} if the class is allowed,
+ * otherwise {@code ObjectInputFilter.Status.REJECTED}
+ */
+ ObjectInputFilter.Status newClientCheckInput(ObjectInputFilter.FilterInfo filterInfo) {
+ ObjectInputFilter.Status status = ObjectInputFilter.Status.UNDECIDED;
+ if (allowedTypes != null && filterInfo.serialClass() != null) {
+ // If enabled, check type
+ String type = filterInfo.serialClass().getName();
+ if (allowedTypes.contains(type))
+ status = ObjectInputFilter.Status.ALLOWED;
+ else
+ status = ObjectInputFilter.Status.REJECTED;
}
+ return status;
}
private final int port;
private final RMIClientSocketFactory csf;
private final RMIServerSocketFactory ssf;
private final Map env;
-
- private static class ExportedWrapper implements RMIServer, DeserializationChecker {
- private final RMIServer impl;
- private final List allowedTypes;
-
- private ExportedWrapper(RMIServer impl, List credentialsTypes) {
- this.impl = impl;
- allowedTypes = credentialsTypes;
- }
-
- @Override
- public String getVersion() throws RemoteException {
- return impl.getVersion();
- }
-
- @Override
- public RMIConnection newClient(Object credentials) throws IOException {
- return impl.newClient(credentials);
- }
-
- @Override
- public void check(Method method, ObjectStreamClass descriptor,
- int paramIndex, int callID) {
- String type = descriptor.getName();
- if (!allowedTypes.contains(type)) {
- throw new ClassCastException("Unsupported type: " + type);
- }
- }
-
- @Override
- public void checkProxyClass(Method method, String[] ifaces,
- int paramIndex, int callID) {
- if (ifaces != null && ifaces.length > 0) {
- for (String iface : ifaces) {
- if (!allowedTypes.contains(iface)) {
- throw new ClassCastException("Unsupported type: " + iface);
- }
- }
- }
- }
- }
+ private final Set allowedTypes;
+ private final ObjectInputFilter jmxRmiFilter;
+ private final ObjectInputFilter cFilter;
}
diff --git a/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java b/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java
index 2944e5d0f13..d04e9292fd5 100644
--- a/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java
+++ b/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java
@@ -35,8 +35,6 @@ import java.security.AccessControlException;
import java.security.Permission;
import java.rmi.server.RMIClassLoader;
import java.security.PrivilegedAction;
-import jdk.internal.misc.ObjectStreamClassValidator;
-import jdk.internal.misc.SharedSecrets;
/**
* MarshalInputStream is an extension of ObjectInputStream. When resolving
@@ -54,11 +52,6 @@ import jdk.internal.misc.SharedSecrets;
* @author Peter Jones
*/
public class MarshalInputStream extends ObjectInputStream {
- interface StreamChecker extends ObjectStreamClassValidator {
- void checkProxyInterfaceNames(String[] ifaces);
- }
-
- private volatile StreamChecker streamChecker = null;
/**
* Value of "java.rmi.server.useCodebaseOnly" property,
@@ -245,11 +238,6 @@ public class MarshalInputStream extends ObjectInputStream {
protected Class resolveProxyClass(String[] interfaces)
throws IOException, ClassNotFoundException
{
- StreamChecker checker = streamChecker;
- if (checker != null) {
- checker.checkProxyInterfaceNames(interfaces);
- }
-
/*
* Always read annotation written by MarshalOutputStream.
*/
@@ -330,28 +318,4 @@ public class MarshalInputStream extends ObjectInputStream {
void useCodebaseOnly() {
useCodebaseOnly = true;
}
-
- synchronized void setStreamChecker(StreamChecker checker) {
- streamChecker = checker;
- SharedSecrets.getJavaObjectInputStreamAccess().setValidator(this, checker);
- }
- @Override
- protected ObjectStreamClass readClassDescriptor() throws IOException,
- ClassNotFoundException {
- ObjectStreamClass descriptor = super.readClassDescriptor();
-
- validateDesc(descriptor);
-
- return descriptor;
- }
-
- private void validateDesc(ObjectStreamClass descriptor) {
- StreamChecker checker;
- synchronized (this) {
- checker = streamChecker;
- }
- if (checker != null) {
- checker.validateDescriptor(descriptor);
- }
- }
}
diff --git a/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
index f0a4e0f4e00..9dbaed70c59 100644
--- a/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
+++ b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
@@ -30,7 +30,6 @@ import java.io.ObjectInput;
import java.io.ObjectInputFilter;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
-import java.io.ObjectStreamClass;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.rmi.AccessException;
@@ -330,11 +329,16 @@ public class UnicastServerRef extends UnicastRef
logCall(obj, method);
// unmarshal parameters
- Object[] params = null;
+ Class[] types = method.getParameterTypes();
+ Object[] params = new Object[types.length];
try {
unmarshalCustomCallData(in);
- params = unmarshalParameters(obj, method, marshalStream);
+ // Unmarshal the parameters
+ for (int i = 0; i < types.length; i++) {
+ params[i] = unmarshalValue(types[i], in);
+ }
+
} catch (AccessException aex) {
// For compatibility, AccessException is not wrapped in UnmarshalException
// disable saving any refs in the inputStream for GC
@@ -600,84 +604,4 @@ public class UnicastServerRef extends UnicastRef
}
}
- /**
- * Unmarshal parameters for the given method of the given instance over
- * the given marshalinputstream. Perform any necessary checks.
- */
- private Object[] unmarshalParameters(Object obj, Method method, MarshalInputStream in)
- throws IOException, ClassNotFoundException {
- return (obj instanceof DeserializationChecker) ?
- unmarshalParametersChecked((DeserializationChecker)obj, method, in) :
- unmarshalParametersUnchecked(method, in);
- }
-
- /**
- * Unmarshal parameters for the given method of the given instance over
- * the given marshalinputstream. Do not perform any additional checks.
- */
- private Object[] unmarshalParametersUnchecked(Method method, ObjectInput in)
- throws IOException, ClassNotFoundException {
- Class[] types = method.getParameterTypes();
- Object[] params = new Object[types.length];
- for (int i = 0; i < types.length; i++) {
- params[i] = unmarshalValue(types[i], in);
- }
- return params;
- }
-
- /**
- * Unmarshal parameters for the given method of the given instance over
- * the given marshalinputstream. Do perform all additional checks.
- */
- private Object[] unmarshalParametersChecked(
- DeserializationChecker checker,
- Method method, MarshalInputStream in)
- throws IOException, ClassNotFoundException {
- int callID = methodCallIDCount.getAndIncrement();
- MyChecker myChecker = new MyChecker(checker, method, callID);
- in.setStreamChecker(myChecker);
- try {
- Class[] types = method.getParameterTypes();
- Object[] values = new Object[types.length];
- for (int i = 0; i < types.length; i++) {
- myChecker.setIndex(i);
- values[i] = unmarshalValue(types[i], in);
- }
- myChecker.end(callID);
- return values;
- } finally {
- in.setStreamChecker(null);
- }
- }
-
- private static class MyChecker implements MarshalInputStream.StreamChecker {
- private final DeserializationChecker descriptorCheck;
- private final Method method;
- private final int callID;
- private int parameterIndex;
-
- MyChecker(DeserializationChecker descriptorCheck, Method method, int callID) {
- this.descriptorCheck = descriptorCheck;
- this.method = method;
- this.callID = callID;
- }
-
- @Override
- public void validateDescriptor(ObjectStreamClass descriptor) {
- descriptorCheck.check(method, descriptor, parameterIndex, callID);
- }
-
- @Override
- public void checkProxyInterfaceNames(String[] ifaces) {
- descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID);
- }
-
- void setIndex(int parameterIndex) {
- this.parameterIndex = parameterIndex;
- }
-
- void end(int callId) {
- descriptorCheck.end(callId);
- }
- }
}
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/Target.java b/src/java.rmi/share/classes/sun/rmi/transport/Target.java
index 82c849e2696..e9150ed62aa 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/Target.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/Target.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.rmi.server.ObjID;
import java.rmi.server.Unreferenced;
import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.*;
import sun.rmi.runtime.Log;
import sun.rmi.runtime.NewThreadAction;
@@ -322,27 +323,15 @@ public final class Target {
Remote obj = getImpl();
if (obj instanceof Unreferenced) {
final Unreferenced unrefObj = (Unreferenced) obj;
- final Thread t =
- java.security.AccessController.doPrivileged(
- new NewThreadAction(new Runnable() {
- public void run() {
- unrefObj.unreferenced();
- }
- }, "Unreferenced-" + nextThreadNum++, false, true));
- // REMIND: access to nextThreadNum not synchronized; you care?
- /*
- * We must manually set the context class loader appropriately
- * for threads that may invoke user code (see bugid 4171278).
- */
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Void run() {
- t.setContextClassLoader(ccl);
- return null;
- }
- });
-
- t.start();
+ AccessController.doPrivileged(
+ new NewThreadAction(() -> {
+ Thread.currentThread().setContextClassLoader(ccl);
+ AccessController.doPrivileged((PrivilegedAction) () -> {
+ unrefObj.unreferenced();
+ return null;
+ }, acc);
+ }, "Unreferenced-" + nextThreadNum++, false, true)).start();
+ // REMIND: access to nextThreadNum not synchronized; you care?
}
unpinImpl();
diff --git a/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java b/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
index d7e8f49fa83..019ea781a3c 100644
--- a/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
+++ b/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
@@ -270,7 +270,7 @@ final class CardImpl extends Card {
}
public String toString() {
- return "PC/SC card in " + terminal.getName()
+ return "PC/SC card in " + terminal.name
+ ", protocol " + getProtocol() + ", state " + state;
}
@@ -278,6 +278,7 @@ final class CardImpl extends Card {
protected void finalize() throws Throwable {
try {
if (state == State.OK) {
+ state = State.DISCONNECTED;
SCardDisconnect(cardId, SCARD_LEAVE_CARD);
}
} finally {
diff --git a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
index e7977c05e77..9052598c052 100644
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
@@ -34,6 +34,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import javax.xml.ws.WebServiceException;
@@ -122,13 +124,21 @@ public abstract class JAXWSExceptionBase
String resourceBundleName = (String) in.readObject();
String key = (String) in.readObject();
int len = in.readInt();
- if (len == -1) {
+ if (len < -1) {
+ throw new NegativeArraySizeException();
+ } else if (len == -1) {
args = null;
- } else {
+ } else if (len < 255) {
args = new Object[len];
for (int i = 0; i < args.length; i++) {
args[i] = in.readObject();
}
+ } else {
+ List argList = new ArrayList<>(Math.min(len, 1024));
+ for (int i = 0; i < len; i++) {
+ argList.add(in.readObject());
+ }
+ args = argList.toArray(new Object[argList.size()]);
}
msg = new LocalizableMessageFactory(resourceBundleName).getMessage(key,args);
}
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
index 26438e437c8..53986898e16 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +26,7 @@ package com.sun.org.apache.xalan.internal.utils;
*/
public final class ConfigurationError
extends Error {
+ private static final long serialVersionUID = 749136645488750664L;
//
// Data
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
index 406e78d9864..4bda6b4f757 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +26,8 @@ package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
* state from which it cannot recover.
*/
public class InternalError extends Error {
+ private static final long serialVersionUID = -6690855975016554786L;
+
/**
* Construct an InternalError with the specified error message.
* @param msg the error message
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
index d51e8457c2d..f185c07882e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +27,7 @@ package com.sun.org.apache.xalan.internal.xsltc.runtime;
* As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
*/
public class InternalRuntimeError extends Error {
+ private static final long serialVersionUID = 2802784919179095307L;
public InternalRuntimeError(String message) {
super(message);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
index 83de0154ba6..317cb0aa23a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +23,6 @@
* questions.
*/
-/*
- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
- */
-
package com.sun.org.apache.xerces.internal.jaxp.datatype;
@@ -52,6 +49,7 @@ import javax.xml.datatype.DatatypeConstants;
class DurationDayTimeImpl
extends DurationImpl {
+ private static final long serialVersionUID = 844792794952655204L;
public DurationDayTimeImpl(
boolean isPositive,
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
index c4b41b8021b..2dc32f9d013 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ import javax.xml.datatype.DatatypeConstants;
class DurationYearMonthImpl
extends DurationImpl {
-
+ private static final long serialVersionUID = -4430140662861507958L;
/**
* Constructs a new Duration object by specifying each field individually.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
index ebed5682552..c8100c25bc5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +40,8 @@ import org.xml.sax.SAXException;
* Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
public class WrappedSAXException extends RuntimeException {
+ private static final long serialVersionUID = -3201986204982729962L;
+
public final SAXException exception;
WrappedSAXException( SAXException e ) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
index 097a5d47e69..13624da511c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,8 +24,8 @@ package com.sun.org.apache.xerces.internal.utils;
/**
* A configuration error. This was an internal class in ObjectFactory previously
*/
-public final class ConfigurationError
- extends Error {
+public final class ConfigurationError extends Error {
+ private static final long serialVersionUID = 8095902236393167968L;
//
// Data
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java
index 320ad7f7067..616e6abd36a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -73,6 +73,7 @@ final class URI
*/
public static class MalformedURIException extends IOException
{
+ private static final long serialVersionUID = 4651455286983598951L;
/**
* Constructs a MalformedURIException with no specified
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
index 18cf1b42d4c..111230f786d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,7 +61,7 @@ import java.util.Objects;
*/
public class URI implements Serializable
{
- static final long serialVersionUID = 7096266377907081897L;
+ private static final long serialVersionUID = 7096266377907081897L;
/**
* MalformedURIExceptions are thrown in the process of building a URI
@@ -71,6 +71,7 @@ public class URI implements Serializable
*/
public static class MalformedURIException extends IOException
{
+ private static final long serialVersionUID = -8498313684991136829L;
/**
* Constructs a MalformedURIException with no specified
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
index 6b86ab556f8..a0cf90f3219 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
@@ -71,6 +71,14 @@ public abstract class PredicatedNodeTest extends NodeTest implements SubContextL
{
stream.defaultReadObject();
m_predicateIndex = -1;
+
+ /**
+ * Initialize to the declared value.
+ * As noted at declaration, this variable is used only for clones for getLastPos,
+ * it should have been excluded from serialization. For compatibility, we'll
+ * keep it as is but initializing to the declared value.
+ */
+ m_predCount = -1;
resetProximityPositions();
}
catch (ClassNotFoundException cnfe)
diff --git a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
index a1496fbe68a..f44af8e7227 100644
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ package javax.xml.datatype;
*/
public class DatatypeConfigurationException extends Exception {
+ private static final long serialVersionUID = -1699373159027047238L;
/**
* Create a new DatatypeConfigurationException with
diff --git a/src/java.xml/share/classes/javax/xml/namespace/QName.java b/src/java.xml/share/classes/javax/xml/namespace/QName.java
index 9d582be078e..88679df4b8e 100644
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java
@@ -70,57 +70,8 @@ import jdk.xml.internal.SecuritySupport;
*/
public class QName implements Serializable {
-
- /**
- *
Stream Unique Identifier.
- *
- * Due to a historical defect, QName was released with multiple
- * serialVersionUID values even though its serialization was the
- * same.
- *
- * To workaround this issue, serialVersionUID is set with either
- * a default value or a compatibility value. To use the
- * compatibility value, set the system property:
- *
- * com.sun.xml.namespace.QName.useCompatibleSerialVersionUID=1.0
- *
- * This workaround was inspired by classes in the javax.management
- * package, e.g. ObjectName, etc.
- * See CR6267224 for original defect report.
- */
- private static final long serialVersionUID;
- /**
- * Default serialVersionUID value.
- */
- private static final long defaultSerialVersionUID = -9120448754896609940L;
- /**
- * Compatibility serialVersionUID value.
- */
- private static final long compatibleSerialVersionUID = 4418622981026545151L;
- /**
- * Flag to use default or campatible serialVersionUID.
- */
- private static boolean useDefaultSerialVersionUID = true;
- static {
- try {
- // use a privileged block as reading a system property
- String valueUseCompatibleSerialVersionUID = SecuritySupport.getSystemProperty(
- "com.sun.xml.namespace.QName.useCompatibleSerialVersionUID");
-
- useDefaultSerialVersionUID = (valueUseCompatibleSerialVersionUID != null
- && valueUseCompatibleSerialVersionUID.equals("1.0")) ? false : true;
- } catch (Exception exception) {
- // use default if any Exceptions
- useDefaultSerialVersionUID = true;
- }
-
- // set serialVersionUID to desired value
- if (useDefaultSerialVersionUID) {
- serialVersionUID = defaultSerialVersionUID;
- } else {
- serialVersionUID = compatibleSerialVersionUID;
- }
- }
+ // tests show that the ID is the same from JDK 1.5 through JDK 9
+ private static final long serialVersionUID = -9120448754896609940L;
/**
* Namespace URI of this QName.
diff --git a/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java
index 587d4175784..2f678520195 100644
--- a/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java
+++ b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ package javax.xml.parsers;
*/
public class ParserConfigurationException extends Exception {
-
+ private static final long serialVersionUID = -3688849216575373917L;
/**
* Create a new ParserConfigurationException with no
* detail message.
diff --git a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
index 4b3d6447d1e..4834fb216de 100644
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ package javax.xml.stream;
*/
public class XMLStreamException extends Exception {
+ private static final long serialVersionUID = 2018819321811497362L;
protected Throwable nested;
protected Location location;
diff --git a/src/java.xml/share/classes/org/w3c/dom/events/EventException.java b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
index 1d646b4f63c..53bb3480754 100644
--- a/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
@@ -48,6 +48,8 @@ package org.w3c.dom.events;
* @since 1.5, DOM Level 2
*/
public class EventException extends RuntimeException {
+ private static final long serialVersionUID = 242753408332692061L;
+
public EventException(short code, String message) {
super(message);
this.code = code;
diff --git a/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
index fad53bafc1d..61ec756ed91 100644
--- a/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
@@ -58,6 +58,8 @@ and Save Specification.
* @since 1.5
*/
public class LSException extends RuntimeException {
+ private static final long serialVersionUID = 5371691160978884690L;
+
public LSException(short code, String message) {
super(message);
this.code = code;
diff --git a/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
index e269b0fd93d..46a4eb5d9b6 100644
--- a/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
@@ -48,6 +48,8 @@ package org.w3c.dom.ranges;
* @since 9, DOM Level 2
*/
public class RangeException extends RuntimeException {
+ private static final long serialVersionUID = 2427563372446661889L;
+
public RangeException(short code, String message) {
super(message);
this.code = code;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 4be03fdfc1d..f0d37f1de52 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -292,8 +292,8 @@ public class Types {
@Override
public Type visitTypeVar(TypeVar t, ProjectionKind pkind) {
if (vars.contains(t)) {
- try {
- if (seen.add(t)) {
+ if (seen.add(t)) {
+ try {
final Type bound;
switch (pkind) {
case UPWARDS:
@@ -309,12 +309,13 @@ public class Types {
return null;
}
return bound.map(this, pkind);
- } else {
- //cycle
- return syms.objectType;
+ } finally {
+ seen.remove(t);
}
- } finally {
- seen.remove(t);
+ } else {
+ //cycle
+ return pkind == ProjectionKind.UPWARDS ?
+ syms.objectType : syms.botType;
}
} else {
return t;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
index 590266591ad..f79f109b2e6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
@@ -58,12 +58,10 @@ import com.sun.tools.javac.tree.TreeScanner;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.DefinedBy;
import com.sun.tools.javac.util.DefinedBy.Api;
-import com.sun.tools.javac.util.JCDiagnostic;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Names;
import com.sun.tools.javac.util.Options;
import java.util.EnumSet;
@@ -104,7 +102,7 @@ public class Analyzer {
final DeferredAttr deferredAttr;
final ArgumentAttr argumentAttr;
final TreeMaker make;
- final Names names;
+ final AnalyzerCopier copier;
private final boolean allowDiamondWithAnonymousClassCreation;
final EnumSet analyzerModes;
@@ -124,7 +122,7 @@ public class Analyzer {
deferredAttr = DeferredAttr.instance(context);
argumentAttr = ArgumentAttr.instance(context);
make = TreeMaker.instance(context);
- names = Names.instance(context);
+ copier = new AnalyzerCopier();
Options options = Options.instance(context);
String findOpt = options.get("find");
//parse modes
@@ -205,15 +203,14 @@ public class Analyzer {
abstract boolean match(S tree);
/**
- * Rewrite a given AST node into a new one
+ * Rewrite a given AST node into a new one(s)
*/
- abstract T map(S oldTree, S newTree);
+ abstract List rewrite(S oldTree);
/**
* Entry-point for comparing results and generating diagnostics.
*/
abstract void process(S oldTree, T newTree, boolean hasErrors);
-
}
/**
@@ -233,11 +230,14 @@ public class Analyzer {
}
@Override
- JCNewClass map(JCNewClass oldTree, JCNewClass newTree) {
- if (newTree.clazz.hasTag(TYPEAPPLY)) {
- ((JCTypeApply)newTree.clazz).arguments = List.nil();
+ List rewrite(JCNewClass oldTree) {
+ if (oldTree.clazz.hasTag(TYPEAPPLY)) {
+ JCNewClass nc = copier.copy(oldTree);
+ ((JCTypeApply)nc.clazz).arguments = List.nil();
+ return List.of(nc);
+ } else {
+ return List.of(oldTree);
}
- return newTree;
}
@Override
@@ -301,12 +301,14 @@ public class Analyzer {
}
@Override
- JCLambda map (JCNewClass oldTree, JCNewClass newTree){
- JCMethodDecl md = (JCMethodDecl)decls(newTree.def).head;
+ List rewrite(JCNewClass oldTree){
+ JCMethodDecl md = (JCMethodDecl)decls(oldTree.def).head;
List params = md.params;
JCBlock body = md.body;
- return make.Lambda(params, body);
+ JCLambda newTree = make.Lambda(params, body);
+ return List.of(newTree);
}
+
@Override
void process (JCNewClass oldTree, JCLambda newTree, boolean hasErrors){
if (!hasErrors) {
@@ -330,10 +332,12 @@ public class Analyzer {
tree.typeargs.nonEmpty();
}
@Override
- JCMethodInvocation map (JCMethodInvocation oldTree, JCMethodInvocation newTree){
- newTree.typeargs = List.nil();
- return newTree;
+ List rewrite(JCMethodInvocation oldTree){
+ JCMethodInvocation app = copier.copy(oldTree);
+ app.typeargs = List.nil();
+ return List.of(app);
}
+
@Override
void process (JCMethodInvocation oldTree, JCMethodInvocation newTree, boolean hasErrors){
if (!hasErrors) {
@@ -355,7 +359,8 @@ public class Analyzer {
/**
* Map a variable tree into a new declaration using implicit type.
*/
- JCVariableDecl mapVar(JCVariableDecl oldTree, JCVariableDecl newTree){
+ JCVariableDecl rewriteVarType(JCVariableDecl oldTree) {
+ JCVariableDecl newTree = copier.copy(oldTree);
newTree.vartype = null;
return newTree;
}
@@ -363,7 +368,7 @@ public class Analyzer {
/**
* Analyze results of local variable inference.
*/
- void processVar(JCVariableDecl oldTree, JCVariableDecl newTree, boolean hasErrors){
+ void processVar(JCVariableDecl oldTree, JCVariableDecl newTree, boolean hasErrors) {
if (!hasErrors) {
if (types.isSameType(oldTree.type, newTree.type)) {
log.warning(oldTree, Warnings.LocalRedundantType);
@@ -387,8 +392,8 @@ public class Analyzer {
attr.canInferLocalVarType(tree) == null;
}
@Override
- JCVariableDecl map(JCVariableDecl oldTree, JCVariableDecl newTree){
- return mapVar(oldTree, newTree);
+ List rewrite(JCVariableDecl oldTree) {
+ return List.of(rewriteVarType(oldTree));
}
@Override
void process(JCVariableDecl oldTree, JCVariableDecl newTree, boolean hasErrors){
@@ -410,10 +415,11 @@ public class Analyzer {
return !tree.var.isImplicitlyTyped();
}
@Override
- JCEnhancedForLoop map(JCEnhancedForLoop oldTree, JCEnhancedForLoop newTree){
- newTree.var = mapVar(oldTree.var, newTree.var);
- newTree.body = make.Block(0, List.nil()); //ignore body for analysis purpose
- return newTree;
+ List rewrite(JCEnhancedForLoop oldTree) {
+ JCEnhancedForLoop newTree = copier.copy(oldTree);
+ newTree.var = rewriteVarType(oldTree.var);
+ newTree.body = make.Block(0, List.nil());
+ return List.of(newTree);
}
@Override
void process(JCEnhancedForLoop oldTree, JCEnhancedForLoop newTree, boolean hasErrors){
@@ -464,12 +470,13 @@ public class Analyzer {
* and speculatively type-check the rewritten code to compare results against previously attributed code.
*/
void analyze(JCStatement statement, Env env) {
- AnalysisContext context = new AnalysisContext(statement, env);
- StatementScanner statementScanner = new StatementScanner(context);
- statementScanner.scan(statement);
+ StatementScanner statementScanner = new StatementScanner(statement, env);
+ statementScanner.scan();
- if (!context.treesToAnalyzer.isEmpty()) {
- deferredAnalysisHelper.queue(context);
+ if (!statementScanner.rewritings.isEmpty()) {
+ for (RewritingContext rewriting : statementScanner.rewritings) {
+ deferredAnalysisHelper.queue(rewriting);
+ }
}
}
@@ -480,7 +487,7 @@ public class Analyzer {
/**
* Add a new analysis task to the queue.
*/
- void queue(AnalysisContext context);
+ void queue(RewritingContext rewriting);
/**
* Flush queue with given attribution env.
*/
@@ -492,7 +499,7 @@ public class Analyzer {
*/
DeferredAnalysisHelper flushDeferredHelper = new DeferredAnalysisHelper() {
@Override
- public void queue(AnalysisContext context) {
+ public void queue(RewritingContext rewriting) {
//do nothing
}
@@ -508,12 +515,12 @@ public class Analyzer {
*/
DeferredAnalysisHelper queueDeferredHelper = new DeferredAnalysisHelper() {
- Map> Q = new HashMap<>();
+ Map> Q = new HashMap<>();
@Override
- public void queue(AnalysisContext context) {
- ArrayList s = Q.computeIfAbsent(context.env.enclClass.sym.outermostClass(), k -> new ArrayList<>());
- s.add(context);
+ public void queue(RewritingContext rewriting) {
+ ArrayList s = Q.computeIfAbsent(rewriting.env.enclClass.sym.outermostClass(), k -> new ArrayList<>());
+ s.add(rewriting);
}
@Override
@@ -522,9 +529,9 @@ public class Analyzer {
DeferredAnalysisHelper prevHelper = deferredAnalysisHelper;
try {
deferredAnalysisHelper = flushDeferredHelper;
- ArrayList s = Q.get(flushEnv.enclClass.sym.outermostClass());
- while (s != null && !s.isEmpty()) {
- doAnalysis(s.remove(0));
+ ArrayList rewritings = Q.get(flushEnv.enclClass.sym.outermostClass());
+ while (rewritings != null && !rewritings.isEmpty()) {
+ doAnalysis(rewritings.remove(0));
}
} finally {
deferredAnalysisHelper = prevHelper;
@@ -535,28 +542,24 @@ public class Analyzer {
DeferredAnalysisHelper deferredAnalysisHelper = queueDeferredHelper;
- void doAnalysis(AnalysisContext context) {
+ void doAnalysis(RewritingContext rewriting) {
DiagnosticSource prevSource = log.currentSource();
LocalCacheContext localCacheContext = argumentAttr.withLocalCacheContext();
try {
- log.useSource(context.env.toplevel.getSourceFile());
+ log.useSource(rewriting.env.toplevel.getSourceFile());
- JCStatement treeToAnalyze = (JCStatement)context.tree;
- if (context.env.info.scope.owner.kind == Kind.TYP) {
+ JCStatement treeToAnalyze = (JCStatement)rewriting.originalTree;
+ if (rewriting.env.info.scope.owner.kind == Kind.TYP) {
//add a block to hoist potential dangling variable declarations
- treeToAnalyze = make.Block(Flags.SYNTHETIC, List.of((JCStatement)context.tree));
+ treeToAnalyze = make.Block(Flags.SYNTHETIC, List.of((JCStatement)rewriting.originalTree));
}
- TreeMapper treeMapper = new TreeMapper(context);
//TODO: to further refine the analysis, try all rewriting combinations
- deferredAttr.attribSpeculative(treeToAnalyze, context.env, attr.statInfo, treeMapper,
- t -> new AnalyzeDeferredDiagHandler(context), argumentAttr.withLocalCacheContext());
- context.treeMap.entrySet().forEach(e -> {
- context.treesToAnalyzer.get(e.getKey())
- .process(e.getKey(), e.getValue(), context.errors.nonEmpty());
- });
+ deferredAttr.attribSpeculative(treeToAnalyze, rewriting.env, attr.statInfo, new TreeRewriter(rewriting),
+ t -> rewriting.diagHandler(), argumentAttr.withLocalCacheContext());
+ rewriting.analyzer.process(rewriting.oldTree, rewriting.replacement, rewriting.erroneous);
} catch (Throwable ex) {
- Assert.error("Analyzer error when processing: " + context.tree);
+ Assert.error("Analyzer error when processing: " + rewriting.originalTree);
} finally {
log.useSource(prevSource.getFile());
localCacheContext.leave();
@@ -567,66 +570,23 @@ public class Analyzer {
deferredAnalysisHelper.flush(flushEnv);
}
- /**
- * Simple deferred diagnostic handler which filters out all messages and keep track of errors.
- */
- class AnalyzeDeferredDiagHandler extends Log.DeferredDiagnosticHandler {
- AnalysisContext context;
-
- public AnalyzeDeferredDiagHandler(AnalysisContext context) {
- super(log, d -> {
- if (d.getType() == DiagnosticType.ERROR) {
- context.errors.add(d);
- }
- return true;
- });
- this.context = context;
- }
- }
-
- /**
- * This class is used to pass around contextual information bewteen analyzer classes, such as
- * trees to be rewritten, errors occurred during the speculative attribution step, etc.
- */
- class AnalysisContext {
-
- JCTree tree;
-
- Env env;
-
- AnalysisContext(JCTree tree, Env env) {
- this.tree = tree;
- this.env = attr.copyEnv(env);
- /* this is a temporary workaround that should be removed once we have a truly independent
- * clone operation
- */
- if (tree.hasTag(VARDEF)) {
- // avoid redefinition clashes
- this.env.info.scope.remove(((JCVariableDecl)tree).sym);
- }
- }
-
- /** Map from trees to analyzers. */
- Map> treesToAnalyzer = new HashMap<>();
-
- /** Map from original AST nodes to rewritten AST nodes */
- Map treeMap = new HashMap<>();
-
- /** Errors in rewritten tree */
- ListBuffer errors = new ListBuffer<>();
- }
-
/**
* Subclass of {@link com.sun.tools.javac.tree.TreeScanner} which visit AST-nodes w/o crossing
* statement boundaries.
*/
class StatementScanner extends TreeScanner {
+ /** Tree rewritings (generated by analyzers). */
+ ListBuffer rewritings = new ListBuffer<>();
+ JCTree originalTree;
+ Env env;
- /** context */
- AnalysisContext context;
+ StatementScanner(JCTree originalTree, Env env) {
+ this.originalTree = originalTree;
+ this.env = attr.copyEnv(env);
+ }
- StatementScanner(AnalysisContext context) {
- this.context = context;
+ public void scan() {
+ scan(originalTree);
}
@Override
@@ -637,7 +597,9 @@ public class Analyzer {
if (analyzer.isEnabled() &&
tree.hasTag(analyzer.tag) &&
analyzer.match(tree)) {
- context.treesToAnalyzer.put(tree, analyzer);
+ for (JCTree t : analyzer.rewrite(tree)) {
+ rewritings.add(new RewritingContext(originalTree, tree, t, analyzer, env));
+ }
break; //TODO: cover cases where multiple matching analyzers are found
}
}
@@ -705,28 +667,60 @@ public class Analyzer {
}
}
+ class RewritingContext {
+ // the whole tree being analyzed
+ JCTree originalTree;
+ // a subtree, old tree, that will be rewritten
+ JCTree oldTree;
+ // the replacement for the old tree
+ JCTree replacement;
+ // did the compiler find any error
+ boolean erroneous;
+ // the env
+ Env env;
+ // the corresponding analyzer
+ StatementAnalyzer analyzer;
+
+ RewritingContext(
+ JCTree originalTree,
+ JCTree oldTree,
+ JCTree replacement,
+ StatementAnalyzer analyzer,
+ Env env) {
+ this.originalTree = originalTree;
+ this.oldTree = oldTree;
+ this.replacement = replacement;
+ this.analyzer = analyzer;
+ this.env = attr.copyEnv(env);
+ /* this is a temporary workaround that should be removed once we have a truly independent
+ * clone operation
+ */
+ if (originalTree.hasTag(VARDEF)) {
+ // avoid redefinition clashes
+ this.env.info.scope.remove(((JCVariableDecl)originalTree).sym);
+ }
+ }
+
+ /**
+ * Simple deferred diagnostic handler which filters out all messages and keep track of errors.
+ */
+ Log.DeferredDiagnosticHandler diagHandler() {
+ return new Log.DeferredDiagnosticHandler(log, d -> {
+ if (d.getType() == DiagnosticType.ERROR) {
+ erroneous = true;
+ }
+ return true;
+ });
+ }
+ }
+
/**
* Subclass of TreeCopier that maps nodes matched by analyzers onto new AST nodes.
*/
- class TreeMapper extends TreeCopier {
+ class AnalyzerCopier extends TreeCopier {
- AnalysisContext context;
-
- TreeMapper(AnalysisContext context) {
+ public AnalyzerCopier() {
super(make);
- this.context = context;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Z copy(Z tree, Void _unused) {
- Z newTree = super.copy(tree, _unused);
- StatementAnalyzer analyzer = context.treesToAnalyzer.get(tree);
- if (analyzer != null) {
- newTree = (Z)analyzer.map(tree, newTree);
- context.treeMap.put(tree, newTree);
- }
- return newTree;
}
@Override @DefinedBy(Api.COMPILER_TREE)
@@ -753,4 +747,24 @@ public class Analyzer {
return newNewClazz;
}
}
+
+ class TreeRewriter extends AnalyzerCopier {
+
+ RewritingContext rewriting;
+
+ TreeRewriter(RewritingContext rewriting) {
+ this.rewriting = rewriting;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Z copy(Z tree, Void _unused) {
+ Z newTree = super.copy(tree, null);
+ if (tree != null && tree == rewriting.oldTree) {
+ Assert.checkNonNull(rewriting.replacement);
+ newTree = (Z)rewriting.replacement;
+ }
+ return newTree;
+ }
+ }
}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index df606822698..3db572c02e8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -3584,7 +3584,7 @@ public class Check {
private boolean isCanonical(JCTree tree) {
while (tree.hasTag(SELECT)) {
JCFieldAccess s = (JCFieldAccess) tree;
- if (s.sym.owner.name != TreeInfo.symbol(s.selected).name)
+ if (s.sym.owner.getQualifiedName() != TreeInfo.symbol(s.selected).getQualifiedName())
return false;
tree = s.selected;
}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
index b57cf7b2bdb..eaf6f4f9f69 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
@@ -304,7 +304,6 @@ public abstract class BaseFileManager implements JavaFileManager {
return (encodingName != null) ? encodingName : getDefaultEncodingName();
}
- @SuppressWarnings("cast")
public CharBuffer decode(ByteBuffer inbuf, boolean ignoreEncodingErrors) {
String encName = getEncodingName();
CharsetDecoder decoder;
@@ -312,7 +311,7 @@ public abstract class BaseFileManager implements JavaFileManager {
decoder = getDecoder(encName, ignoreEncodingErrors);
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
log.error(Errors.UnsupportedEncoding(encName));
- return (CharBuffer)CharBuffer.allocate(1).flip();
+ return CharBuffer.allocate(1).flip();
}
// slightly overestimate the buffer size to avoid reallocation.
@@ -389,7 +388,6 @@ public abstract class BaseFileManager implements JavaFileManager {
* @return a byte buffer containing the contents of the stream
* @throws IOException if an error occurred while reading the stream
*/
- @SuppressWarnings("cast")
public ByteBuffer makeByteBuffer(InputStream in)
throws IOException {
int limit = in.available();
@@ -401,14 +399,14 @@ public abstract class BaseFileManager implements JavaFileManager {
// expand buffer
result = ByteBuffer.
allocate(limit <<= 1).
- put((ByteBuffer)result.flip());
+ put(result.flip());
int count = in.read(result.array(),
position,
limit - position);
if (count < 0) break;
result.position(position += count);
}
- return (ByteBuffer)result.flip();
+ return result.flip();
}
public void recycleByteBuffer(ByteBuffer bb) {
@@ -418,14 +416,13 @@ public abstract class BaseFileManager implements JavaFileManager {
/**
* A single-element cache of direct byte buffers.
*/
- @SuppressWarnings("cast")
private static class ByteBufferCache {
private ByteBuffer cached;
ByteBuffer get(int capacity) {
if (capacity < 20480) capacity = 20480;
ByteBuffer result =
(cached != null && cached.capacity() >= capacity)
- ? (ByteBuffer)cached.clear()
+ ? cached.clear()
: ByteBuffer.allocate(capacity + capacity>>1);
cached = null;
return result;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index 11815eb7b7e..8880f9f6ec2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -98,10 +98,9 @@ import static javax.tools.StandardLocation.*;
*/
public class JavacFileManager extends BaseFileManager implements StandardJavaFileManager {
- @SuppressWarnings("cast")
public static char[] toArray(CharBuffer buffer) {
if (buffer.hasArray())
- return ((CharBuffer)buffer.compact().flip()).array();
+ return buffer.compact().flip().array();
else
return buffer.toString().toCharArray();
}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 0d1a14799a2..354f3433c7f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -2396,9 +2396,8 @@ public class JavacParser implements Parser {
int pos = token.pos;
List stats = blockStatement();
if (stats.isEmpty()) {
- JCErroneous e = F.at(pos).Erroneous();
- error(e, "illegal.start.of.stmt");
- return F.at(pos).Exec(e);
+ JCErroneous e = syntaxError(pos, "illegal.start.of.stmt");
+ return toP(F.at(pos).Exec(e));
} else {
JCStatement first = stats.head;
String error = null;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
index 3aa2e69103f..e3f867248b1 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,13 @@ import java.security.spec.*;
import javax.crypto.spec.DHParameterSpec;
import sun.security.provider.ParameterCache;
+import static sun.security.util.SecurityProviderConstants.*;
import static sun.security.pkcs11.TemplateManager.*;
import sun.security.pkcs11.wrapper.*;
import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+
import sun.security.rsa.RSAKeyFactory;
/**
@@ -98,7 +100,7 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi {
// override lower limit to disallow unsecure keys being generated
// override upper limit to deter DOS attack
if (algorithm.equals("EC")) {
- keySize = 256;
+ keySize = DEF_EC_KEY_SIZE;
if ((minKeyLen == -1) || (minKeyLen < 112)) {
minKeyLen = 112;
}
@@ -107,13 +109,11 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi {
}
} else {
if (algorithm.equals("DSA")) {
- // keep default keysize at 1024 since larger keysizes may be
- // incompatible with SHA1withDSA and SHA-2 Signature algs
- // may not be supported by native pkcs11 implementations
- keySize = 1024;
+ keySize = DEF_DSA_KEY_SIZE;
+ } else if (algorithm.equals("RSA")) {
+ keySize = DEF_RSA_KEY_SIZE;
} else {
- // RSA and DH
- keySize = 2048;
+ keySize = DEF_DH_KEY_SIZE;
}
if ((minKeyLen == -1) || (minKeyLen < 512)) {
minKeyLen = 512;
diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java
index 9ffeff9d7d2..f8cd24c9b14 100644
--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java
+++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java
@@ -39,6 +39,7 @@ import sun.security.ec.ECPublicKeyImpl;
import sun.security.jca.JCAUtil;
import sun.security.util.ECParameters;
import sun.security.util.ECUtil;
+import static sun.security.util.SecurityProviderConstants.DEF_EC_KEY_SIZE;
/**
* EC keypair generator.
@@ -50,7 +51,6 @@ public final class ECKeyPairGenerator extends KeyPairGeneratorSpi {
private static final int KEY_SIZE_MIN = 112; // min bits (see ecc_impl.h)
private static final int KEY_SIZE_MAX = 571; // max bits (see ecc_impl.h)
- private static final int KEY_SIZE_DEFAULT = 256;
// used to seed the keypair generator
private SecureRandom random;
@@ -66,7 +66,7 @@ public final class ECKeyPairGenerator extends KeyPairGeneratorSpi {
*/
public ECKeyPairGenerator() {
// initialize to default in case the app does not call initialize()
- initialize(KEY_SIZE_DEFAULT, null);
+ initialize(DEF_EC_KEY_SIZE, null);
}
// initialize the generator. See JCA doc
diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
index f28e5cb5138..d4f509058fc 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.RSAKeyGenParameterSpec;
import sun.security.rsa.RSAKeyFactory;
+import static sun.security.util.SecurityProviderConstants.DEF_RSA_KEY_SIZE;
/**
* RSA keypair generator.
@@ -45,14 +46,13 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi {
// Supported by Microsoft Base, Strong and Enhanced Cryptographic Providers
static final int KEY_SIZE_MIN = 512; // disallow MSCAPI min. of 384
static final int KEY_SIZE_MAX = 16384;
- private static final int KEY_SIZE_DEFAULT = 2048;
// size of the key to generate, KEY_SIZE_MIN <= keySize <= KEY_SIZE_MAX
private int keySize;
public RSAKeyPairGenerator() {
// initialize to default in case the app does not call initialize()
- initialize(KEY_SIZE_DEFAULT, null);
+ initialize(DEF_RSA_KEY_SIZE, null);
}
// initialize the generator. See JCA doc
@@ -76,7 +76,7 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi {
int tmpSize;
if (params == null) {
- tmpSize = KEY_SIZE_DEFAULT;
+ tmpSize = DEF_RSA_KEY_SIZE;
} else if (params instanceof RSAKeyGenParameterSpec) {
if (((RSAKeyGenParameterSpec) params).getPublicExponent() != null) {
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index 12d4e1ba380..34106ec3897 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -162,11 +162,20 @@ public class Main {
private boolean noTimestamp = false;
private Date expireDate = new Date(0L); // used in noTimestamp warning
- // Severe warnings
+ // Severe warnings.
+
+ // jarsigner used to check signer cert chain validity and key usages
+ // itself and set various warnings. Later CertPath validation is
+ // added but chainNotValidated is only flagged when no other existing
+ // warnings are set. TSA cert chain check is added separately and
+ // only tsaChainNotValidated is set, i.e. has no affect on hasExpiredCert,
+ // notYetValidCert, or any badXyzUsage.
+
private int weakAlg = 0; // 1. digestalg, 2. sigalg, 4. tsadigestalg
private boolean hasExpiredCert = false;
private boolean notYetValidCert = false;
private boolean chainNotValidated = false;
+ private boolean tsaChainNotValidated = false;
private boolean notSignedByAlias = false;
private boolean aliasNotInStore = false;
private boolean hasUnsignedEntry = false;
@@ -176,6 +185,7 @@ public class Main {
private boolean signerSelfSigned = false;
private Throwable chainNotValidatedReason = null;
+ private Throwable tsaChainNotValidatedReason = null;
private boolean seeWeak = false;
@@ -266,7 +276,8 @@ public class Main {
if (strict) {
int exitCode = 0;
- if (weakAlg != 0 || chainNotValidated || hasExpiredCert || notYetValidCert || signerSelfSigned) {
+ if (weakAlg != 0 || chainNotValidated
+ || hasExpiredCert || notYetValidCert || signerSelfSigned) {
exitCode |= 4;
}
if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType) {
@@ -278,6 +289,9 @@ public class Main {
if (notSignedByAlias || aliasNotInStore) {
exitCode |= 32;
}
+ if (tsaChainNotValidated) {
+ exitCode |= 64;
+ }
if (exitCode != 0) {
System.exit(exitCode);
}
@@ -864,6 +878,9 @@ public class Main {
signerSelfSigned = false;
}
+ // If there is a time stamp block inside the PKCS7 block file
+ boolean hasTimestampBlock = false;
+
// Even if the verbose option is not specified, all out strings
// must be generated so seeWeak can be updated.
if (!digestMap.isEmpty()
@@ -892,6 +909,7 @@ public class Main {
PublicKey key = signer.getPublicKey();
PKCS7 tsToken = si.getTsToken();
if (tsToken != null) {
+ hasTimestampBlock = true;
SignerInfo tsSi = tsToken.getSignerInfos()[0];
X509Certificate tsSigner = tsSi.getCertificate(tsToken);
byte[] encTsTokenInfo = tsToken.getContentInfo().getData();
@@ -967,7 +985,7 @@ public class Main {
if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
notYetValidCert || chainNotValidated || hasExpiredCert ||
hasUnsignedEntry || signerSelfSigned || (weakAlg != 0) ||
- aliasNotInStore || notSignedByAlias) {
+ aliasNotInStore || notSignedByAlias || tsaChainNotValidated) {
if (strict) {
System.out.println(rb.getString("jar.verified.with.signer.errors."));
@@ -1019,10 +1037,16 @@ public class Main {
if (chainNotValidated) {
System.out.println(String.format(
- rb.getString("This.jar.contains.entries.whose.certificate.chain.is.not.validated.reason.1"),
+ rb.getString("This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1"),
chainNotValidatedReason.getLocalizedMessage()));
}
+ if (tsaChainNotValidated) {
+ System.out.println(String.format(
+ rb.getString("This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1"),
+ tsaChainNotValidatedReason.getLocalizedMessage()));
+ }
+
if (notSignedByAlias) {
System.out.println(
rb.getString("This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es."));
@@ -1050,8 +1074,15 @@ public class Main {
"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months."));
}
if (noTimestamp) {
- System.out.println(
- String.format(rb.getString("no.timestamp.verifying"), expireDate));
+ if (hasTimestampBlock) {
+ // JarSigner API has not seen the timestamp,
+ // might have ignored it due to weak alg, etc.
+ System.out.println(
+ String.format(rb.getString("bad.timestamp.verifying"), expireDate));
+ } else {
+ System.out.println(
+ String.format(rb.getString("no.timestamp.verifying"), expireDate));
+ }
}
}
if (warningAppeared || errorAppeared) {
@@ -1106,16 +1137,23 @@ public class Main {
private static MessageFormat expiredTimeForm = null;
private static MessageFormat expiringTimeForm = null;
- /*
- * Display some details about a certificate:
+ /**
+ * Returns a string about a certificate:
*
* [] [", " ] [" (" ")"]
* [ | ]
+ * []
*
- * Note: no newline character at the end
+ * Note: no newline character at the end.
+ *
+ * When isTsCert is true, this method sets global flags like hasExpiredCert,
+ * notYetValidCert, badKeyUsage, badExtendedKeyUsage, badNetscapeCertType.
+ *
+ * @param isTsCert true if c is in the TSA cert chain, false otherwise.
+ * @param checkUsage true to check code signer keyUsage
*/
- String printCert(String tab, Certificate c, boolean checkValidityPeriod,
- Date timestamp, boolean checkUsage) {
+ String printCert(boolean isTsCert, String tab, Certificate c,
+ Date timestamp, boolean checkUsage) throws Exception {
StringBuilder certStr = new StringBuilder();
String space = rb.getString("SPACE");
@@ -1135,7 +1173,7 @@ public class Main {
certStr.append(space).append(alias);
}
- if (checkValidityPeriod && x509Cert != null) {
+ if (x509Cert != null) {
certStr.append("\n").append(tab).append("[");
Date notAfter = x509Cert.getNotAfter();
@@ -1148,7 +1186,7 @@ public class Main {
x509Cert.checkValidity();
// test if cert will expire within six months
if (notAfter.getTime() < System.currentTimeMillis() + SIX_MONTHS) {
- hasExpiringCert = true;
+ if (!isTsCert) hasExpiringCert = true;
if (expiringTimeForm == null) {
expiringTimeForm = new MessageFormat(
rb.getString("certificate.will.expire.on"));
@@ -1169,7 +1207,7 @@ public class Main {
certStr.append(validityTimeForm.format(source));
}
} catch (CertificateExpiredException cee) {
- hasExpiredCert = true;
+ if (!isTsCert) hasExpiredCert = true;
if (expiredTimeForm == null) {
expiredTimeForm = new MessageFormat(
@@ -1179,7 +1217,7 @@ public class Main {
certStr.append(expiredTimeForm.format(source));
} catch (CertificateNotYetValidException cnyve) {
- notYetValidCert = true;
+ if (!isTsCert) notYetValidCert = true;
if (notYetTimeForm == null) {
notYetTimeForm = new MessageFormat(
@@ -1398,7 +1436,7 @@ public class Main {
System.out.println(rb.getString("TSA.location.") + tsaUrl);
} else if (tsaCert != null) {
System.out.println(rb.getString("TSA.certificate.") +
- printCert("", tsaCert, false, null, false));
+ printCert(true, "", tsaCert, null, false));
}
}
builder.tsa(tsaURI);
@@ -1458,6 +1496,30 @@ public class Main {
}
}
+ // The JarSigner API always accepts the timestamp received.
+ // We need to extract the certs from the signed jar to
+ // validate it.
+ if (!noTimestamp) {
+ try (JarFile check = new JarFile(signedJarFile)) {
+ PKCS7 p7 = new PKCS7(check.getInputStream(check.getEntry(
+ "META-INF/" + sigfile + "." + privateKey.getAlgorithm())));
+ SignerInfo si = p7.getSignerInfos()[0];
+ PKCS7 tsToken = si.getTsToken();
+ SignerInfo tsSi = tsToken.getSignerInfos()[0];
+ try {
+ validateCertChain(Validator.VAR_TSA_SERVER,
+ tsSi.getCertificateChain(tsToken), null);
+ } catch (Exception e) {
+ tsaChainNotValidated = true;
+ tsaChainNotValidatedReason = e;
+ }
+ } catch (Exception e) {
+ if (debug) {
+ e.printStackTrace();
+ }
+ }
+ }
+
// no IOException thrown in the follow try clause, so disable
// the try clause.
// try {
@@ -1487,8 +1549,10 @@ public class Main {
}
boolean warningAppeared = false;
- if (weakAlg != 0 || badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
- notYetValidCert || chainNotValidated || hasExpiredCert || signerSelfSigned) {
+ if (weakAlg != 0 || badKeyUsage || badExtendedKeyUsage
+ || badNetscapeCertType || notYetValidCert
+ || chainNotValidated || tsaChainNotValidated
+ || hasExpiredCert || signerSelfSigned) {
if (strict) {
System.out.println(rb.getString("jar.signed.with.signer.errors."));
System.out.println();
@@ -1525,10 +1589,16 @@ public class Main {
if (chainNotValidated) {
System.out.println(String.format(
- rb.getString("The.signer.s.certificate.chain.is.not.validated.reason.1"),
+ rb.getString("The.signer.s.certificate.chain.is.invalid.reason.1"),
chainNotValidatedReason.getLocalizedMessage()));
}
+ if (tsaChainNotValidated) {
+ System.out.println(String.format(
+ rb.getString("The.tsa.certificate.chain.is.invalid.reason.1"),
+ tsaChainNotValidatedReason.getLocalizedMessage()));
+ }
+
if (signerSelfSigned) {
System.out.println(
rb.getString("The.signer.s.certificate.is.self.signed."));
@@ -1600,7 +1670,7 @@ public class Main {
/**
* Returns a string of singer info, with a newline at the end
*/
- private String signerInfo(CodeSigner signer, String tab) {
+ private String signerInfo(CodeSigner signer, String tab) throws Exception {
if (cacheForSignerInfo.containsKey(signer)) {
return cacheForSignerInfo.get(signer);
}
@@ -1620,18 +1690,35 @@ public class Main {
// display the certificate(sb). The first one is end-entity cert and
// its KeyUsage should be checked.
boolean first = true;
+ sb.append(tab).append(rb.getString("...Signer")).append('\n');
for (Certificate c : certs) {
- sb.append(printCert(tab, c, true, timestamp, first));
+ sb.append(printCert(false, tab, c, timestamp, first));
sb.append('\n');
first = false;
}
try {
- validateCertChain(certs);
+ validateCertChain(Validator.VAR_CODE_SIGNING, certs, ts);
} catch (Exception e) {
chainNotValidated = true;
chainNotValidatedReason = e;
- sb.append(tab).append(rb.getString(".CertPath.not.validated."))
- .append(e.getLocalizedMessage()).append("]\n"); // TODO
+ sb.append(tab).append(rb.getString(".Invalid.certificate.chain."))
+ .append(e.getLocalizedMessage()).append("]\n");
+ }
+ if (ts != null) {
+ sb.append(tab).append(rb.getString("...TSA")).append('\n');
+ for (Certificate c : ts.getSignerCertPath().getCertificates()) {
+ sb.append(printCert(true, tab, c, timestamp, false));
+ sb.append('\n');
+ }
+ try {
+ validateCertChain(Validator.VAR_TSA_SERVER,
+ ts.getSignerCertPath().getCertificates(), null);
+ } catch (Exception e) {
+ tsaChainNotValidated = true;
+ tsaChainNotValidatedReason = e;
+ sb.append(tab).append(rb.getString(".Invalid.TSA.certificate.chain."))
+ .append(e.getLocalizedMessage()).append("]\n");
+ }
}
if (certs.size() == 1
&& KeyStoreUtil.isSelfSigned((X509Certificate)certs.get(0))) {
@@ -1841,7 +1928,7 @@ public class Main {
}
}
- void getAliasInfo(String alias) {
+ void getAliasInfo(String alias) throws Exception {
Key key = null;
@@ -1887,10 +1974,11 @@ public class Main {
// We don't meant to print anything, the next call
// checks validity and keyUsage etc
- printCert("", certChain[0], true, null, true);
+ printCert(false, "", certChain[0], null, true);
try {
- validateCertChain(Arrays.asList(certChain));
+ validateCertChain(Validator.VAR_CODE_SIGNING,
+ Arrays.asList(certChain), null);
} catch (Exception e) {
chainNotValidated = true;
chainNotValidatedReason = e;
@@ -1949,17 +2037,31 @@ public class Main {
System.exit(1);
}
- void validateCertChain(List certs) throws Exception {
+ /**
+ * Validates a cert chain.
+ *
+ * @param parameter this might be a timestamp
+ */
+ void validateCertChain(String variant, List certs,
+ Object parameter)
+ throws Exception {
try {
Validator.getInstance(Validator.TYPE_PKIX,
- Validator.VAR_CODE_SIGNING,
+ variant,
pkixParameters)
- .validate(certs.toArray(new X509Certificate[certs.size()]));
+ .validate(certs.toArray(new X509Certificate[certs.size()]),
+ null, parameter);
} catch (Exception e) {
if (debug) {
e.printStackTrace();
}
- if (e instanceof ValidatorException) {
+
+ // Exception might be dismissed if another warning flag
+ // is already set by printCert. This is only done for
+ // code signing certs.
+
+ if (variant.equals(Validator.VAR_CODE_SIGNING) &&
+ e instanceof ValidatorException) {
// Throw cause if it's CertPathValidatorException,
if (e.getCause() != null &&
e.getCause() instanceof CertPathValidatorException) {
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
index ebdd79d792e..23f7f578ca3 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,8 @@ public class Resources extends java.util.ListResourceBundle {
{"certificate.is.not.valid.until",
"certificate is not valid until {0}"},
{"certificate.will.expire.on", "certificate will expire on {0}"},
- {".CertPath.not.validated.", "[CertPath not validated: "},
+ {".Invalid.certificate.chain.", "[Invalid certificate chain: "},
+ {".Invalid.TSA.certificate.chain.", "[Invalid TSA certificate chain: "},
{"requesting.a.signature.timestamp",
"requesting a signature timestamp"},
{"TSA.location.", "TSA location: "},
@@ -224,6 +225,8 @@ public class Resources extends java.util.ListResourceBundle {
{"entry.was.signed.on", "entry was signed on {0}"},
{"Warning.", "Warning: "},
{"Error.", "Error: "},
+ {"...Signer", ">>> Signer"},
+ {"...TSA", ">>> TSA"},
{"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
"This jar contains unsigned entries which have not been integrity-checked. "},
{"This.jar.contains.entries.whose.signer.certificate.has.expired.",
@@ -258,20 +261,26 @@ public class Resources extends java.util.ListResourceBundle {
"This jar contains entries whose signer certificate's NetscapeCertType extension doesn't allow code signing."},
{".{0}.extension.does.not.support.code.signing.",
"[{0} extension does not support code signing]"},
- {"The.signer.s.certificate.chain.is.not.validated.reason.1",
- "The signer's certificate chain is not validated. Reason: %s"},
+ {"The.signer.s.certificate.chain.is.invalid.reason.1",
+ "The signer's certificate chain is invalid. Reason: %s"},
+ {"The.tsa.certificate.chain.is.invalid.reason.1",
+ "The TSA certificate chain is invalid. Reason: %s"},
{"The.signer.s.certificate.is.self.signed.",
"The signer's certificate is self-signed."},
{"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.",
"The %1$s algorithm specified for the %2$s option is considered a security risk."},
{"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.",
"The %s signing key has a keysize of %d which is considered a security risk."},
- {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.reason.1",
- "This jar contains entries whose certificate chain is not validated. Reason: %s"},
+ {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
+ "This jar contains entries whose certificate chain is invalid. Reason: %s"},
+ {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
+ "This jar contains entries whose TSA certificate chain is invalid. Reason: %s"},
{"no.timestamp.signing",
"No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
{"no.timestamp.verifying",
"This jar contains signatures that do not include a timestamp. Without a timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td)."},
+ {"bad.timestamp.verifying",
+ "This jar contains signatures that include an invalid timestamp. Without a valid timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td).\nRerun jarsigner with -J-Djava.security.debug=jar for more information."},
{"Unknown.password.type.", "Unknown password type: "},
{"Cannot.find.environment.variable.",
"Cannot find environment variable: "},
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index b21108327b2..8a6e6f2cda2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -43,6 +43,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes;
@@ -64,7 +65,7 @@ import static javax.lang.model.element.Modifier.*;
* @author Jamie Ho (Re-write)
* @author Bhavesh Patel (Modified)
*/
-public abstract class AbstractMemberWriter {
+public abstract class AbstractMemberWriter implements MemberSummaryWriter {
protected final HtmlConfiguration configuration;
protected final Utils utils;
@@ -123,7 +124,7 @@ public abstract class AbstractMemberWriter {
* @param member the member to be documented
* @return the summary table header
*/
- public abstract List getSummaryTableHeader(Element member);
+ public abstract TableHeader getSummaryTableHeader(Element member);
/**
* Add inherited summary label for the member.
@@ -428,8 +429,7 @@ public abstract class AbstractMemberWriter {
for (Element element : members) {
TypeElement te = utils.getEnclosingTypeElement(element);
if (!printedUseTableHeader) {
- table.addContent(writer.getSummaryTableHeader(
- this.getSummaryTableHeader(element), "col"));
+ table.addContent(getSummaryTableHeader(element).toContent());
printedUseTableHeader = true;
}
HtmlTree tr = new HtmlTree(HtmlTag.TR);
@@ -519,7 +519,8 @@ public abstract class AbstractMemberWriter {
* @param counter the counter for determining id and style for the table row
*/
public void addMemberSummary(TypeElement tElement, Element member,
- List firstSentenceTags, List tableContents, int counter) {
+ List firstSentenceTags, List tableContents, int counter,
+ VisibleMemberMap.Kind vmmKind) {
HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD);
tdSummaryType.addStyle(HtmlStyle.colFirst);
writer.addSummaryType(this, member, tdSummaryType);
@@ -532,7 +533,8 @@ public abstract class AbstractMemberWriter {
tdDesc.addStyle(HtmlStyle.colLast);
writer.addSummaryLinkComment(this, member, firstSentenceTags, tdDesc);
tr.addContent(tdDesc);
- if (utils.isMethod(member) && !utils.isAnnotationType(member) && !utils.isProperty(name(member))) {
+ if (utils.isMethod(member) && !utils.isAnnotationType(member)
+ && vmmKind != VisibleMemberMap.Kind.PROPERTIES) {
int methodType = utils.isStatic(member) ? MethodTypes.STATIC.tableTabs().value() :
MethodTypes.INSTANCE.tableTabs().value();
if (utils.isInterface(member.getEnclosingElement())) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
index 3f57cfe8885..af91a3a10e6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
@@ -97,13 +97,9 @@ public abstract class AbstractModuleIndexWriter extends HtmlDocletWriter {
/**
* Adds the modules list to the documentation tree.
*
- * @param modules the set of modules
- * @param text caption for the table
- * @param tableSummary summary for the table
* @param body the document tree to which the modules list will be added
*/
- protected abstract void addModulesList(Collection modules, String text,
- String tableSummary, Content body);
+ protected abstract void addModulesList(Content body);
/**
* Adds the module packages list to the documentation tree.
@@ -213,7 +209,7 @@ public abstract class AbstractModuleIndexWriter extends HtmlDocletWriter {
addAllPackagesLink(ul);
htmlTree.addContent(ul);
body.addContent(htmlTree);
- addModulesList(modules, text, tableSummary, body);
+ addModulesList(body);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
index 3faf2b1a188..60a2a546e15 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
@@ -94,13 +94,9 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
/**
* Adds the packages list to the documentation tree.
*
- * @param packages a collection of packagedoc objects
- * @param text caption for the table
- * @param tableSummary summary for the table
* @param body the document tree to which the packages list will be added
*/
- protected abstract void addPackagesList(Collection packages, String text,
- String tableSummary, Content body);
+ protected abstract void addPackagesList(Content body);
/**
* Generate and prints the contents in the package index file. Call appropriate
@@ -136,23 +132,16 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
* @param body the document tree to which the index will be added
*/
protected void addIndex(Content body) {
- addIndexContents(packages, "doclet.Package_Summary",
- configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Package_Summary"),
- configuration.getText("doclet.packages")), body);
+ addIndexContents(body);
}
/**
* Adds package index contents. Call appropriate methods from
* the sub-classes. Adds it to the body HtmlTree
*
- * @param packages a collection of packages to be documented
- * @param text string which will be used as the heading
- * @param tableSummary summary for the table
* @param body the document tree to which the index contents will be added
*/
- protected void addIndexContents(Collection packages, String text,
- String tableSummary, Content body) {
+ protected void addIndexContents(Content body) {
if (!packages.isEmpty()) {
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.NAV))
? HtmlTree.NAV()
@@ -165,7 +154,7 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
}
htmlTree.addContent(ul);
body.addContent(htmlTree);
- addPackagesList(packages, text, tableSummary, body);
+ addPackagesList(body);
}
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
index dd7ed67003c..f2a5b4b6d82 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.Arrays;
-import java.util.List;
-
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -218,10 +216,10 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Fields"), resources.getText("doclet.Description"));
- return header;
+ @Override
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.modifierAndTypeLabel, contents.fields,
+ contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
index 237f443a247..f3126ac0d54 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
@@ -131,11 +132,10 @@ public class AnnotationTypeOptionalMemberWriterImpl extends
/**
* {@inheritDoc}
*/
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Annotation_Type_Optional_Member"),
- resources.getText("doclet.Description"));
- return header;
+ @Override
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.modifierAndTypeLabel,
+ contents.annotationTypeOptionalMemberLabel, contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
index 06e4a158a1d..98f75793817 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -220,10 +221,9 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Annotation_Type_Required_Member"), resources.getText("doclet.Description"));
- return header;
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.modifierAndTypeLabel,
+ contents.annotationTypeRequiredMemberLabel, contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index 4813dbc1fb9..7019745e675 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -25,6 +25,7 @@
package jdk.javadoc.internal.doclets.formats.html;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -101,6 +102,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
final String fieldUseTableSummary;
final String methodUseTableSummary;
final String constructorUseTableSummary;
+ final String packageUseTableSummary;
/**
* The HTML tree for main tag.
@@ -152,22 +154,27 @@ public class ClassUseWriter extends SubWriterHolderWriter {
"Internal error: package sets don't match: "
+ pkgSet + " with: " + mapper.classToPackage.get(this.typeElement));
}
+
methodSubWriter = new MethodWriterImpl(this);
constrSubWriter = new ConstructorWriterImpl(this);
fieldSubWriter = new FieldWriterImpl(this);
classSubWriter = new NestedClassWriterImpl(this);
- classUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.classes"));
- subclassUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.subclasses"));
- subinterfaceUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.subinterfaces"));
- fieldUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.fields"));
- methodUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.methods"));
- constructorUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.constructors"));
+
+ String useTableSummary = resources.getText("doclet.Use_Table_Summary");
+ classUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.classes"));
+ subclassUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.subclasses"));
+ subinterfaceUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.subinterfaces"));
+ fieldUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.fields"));
+ methodUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.methods"));
+ constructorUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.constructors"));
+ packageUseTableSummary = MessageFormat.format(useTableSummary,
+ resources.getText("doclet.packages"));
}
/**
@@ -290,8 +297,8 @@ public class ClassUseWriter extends SubWriterHolderWriter {
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
- : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
- table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
+ : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
+ table.addContent(getPackageTableHeader().toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = true;
for (PackageElement pkg : pkgSet) {
@@ -323,8 +330,8 @@ public class ClassUseWriter extends SubWriterHolderWriter {
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
- : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
- table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
+ : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
+ table.addContent(getPackageTableHeader().toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = true;
for (PackageElement pkg : pkgToPackageAnnotations) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
index dfa04ab89fe..78e234ce9dd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
@@ -70,7 +70,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
private final String constantsTableSummary;
- private final List constantsTableHeader;
+ private final TableHeader constantsTableHeader;
/**
* The HTML tree for main tag.
@@ -92,10 +92,8 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
this.configuration = configuration;
constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",
configuration.getText("doclet.Constants_Summary"));
- constantsTableHeader = new ArrayList<>();
- constantsTableHeader.add(getModifierTypeHeader());
- constantsTableHeader.add(configuration.getText("doclet.ConstantField"));
- constantsTableHeader.add(configuration.getText("doclet.Value"));
+ constantsTableHeader = new TableHeader(
+ contents.modifierAndTypeLabel, contents.constantFieldLabel, contents.valueLabel);
}
/**
@@ -261,7 +259,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.constantsSummary, caption)
: HtmlTree.TABLE(HtmlStyle.constantsSummary, constantsTableSummary, caption);
- table.addContent(getSummaryTableHeader(constantsTableHeader, "col"));
+ table.addContent(constantsTableHeader.toContent());
return table;
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
index 9a4eb9f8a52..32e90c83cc1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@@ -31,6 +31,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
@@ -260,14 +261,13 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
- List header = new ArrayList<>();
+ public TableHeader getSummaryTableHeader(Element member) {
if (foundNonPubConstructor) {
- header.add(resources.getText("doclet.Modifier"));
+ return new TableHeader(contents.modifierLabel, contents.constructorLabel,
+ contents.descriptionLabel);
+ } else {
+ return new TableHeader(contents.constructorLabel, contents.descriptionLabel);
}
- header.add(resources.getText("doclet.Constructor"));
- header.add(resources.getText("doclet.Description"));
- return header;
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index dc59ec5fb6d..263ceeccb8a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -56,15 +56,20 @@ public class Contents {
public final Content allPackagesLabel;
public final Content allSuperinterfacesLabel;
public final Content also;
+ public final Content annotationTypeOptionalMemberLabel;
+ public final Content annotationTypeRequiredMemberLabel;
public final Content annotateTypeOptionalMemberSummaryLabel;
public final Content annotateTypeRequiredMemberSummaryLabel;
public final Content annotationType;
public final Content annotationTypeDetailsLabel;
public final Content annotationTypeMemberDetail;
+ public final Content annotationtypes;
public final Content annotationTypes;
public final Content classLabel;
public final Content classes;
+ public final Content constantFieldLabel;
public final Content constantsSummaryTitle;
+ public final Content constructorLabel;
public final Content constructorDetailsLabel;
public final Content constructorSummaryLabel;
public final Content constructors;
@@ -81,16 +86,21 @@ public class Contents {
public final Content detailLabel;
public final Content enclosingClassLabel;
public final Content enclosingInterfaceLabel;
+ public final Content enumConstantLabel;
public final Content enumConstantDetailLabel;
public final Content enumConstantSummary;
public final Content enum_;
public final Content enums;
+ public final Content error;
public final Content errors;
+ public final Content exception;
public final Content exceptions;
+ public final Content fieldLabel;
public final Content fieldDetailsLabel;
public final Content fieldSummaryLabel;
public final Content fields;
public final Content framesLabel;
+ public final Content fromLabel;
public final Content functionalInterface;
public final Content functionalInterfaceMessage;
public final Content helpLabel;
@@ -100,11 +110,15 @@ public class Contents {
public final Content inClass;
public final Content inInterface;
public final Content indexLabel;
+ public final Content interfaceLabel;
public final Content interfaces;
public final Content interfacesItalic;
public final Content methodDetailLabel;
+ public final Content methodLabel;
public final Content methodSummary;
public final Content methods;
+ public final Content modifierAndTypeLabel;
+ public final Content modifierLabel;
public final Content moduleLabel;
public final Content module_;
public final Content moduleSubNavLabel;
@@ -143,6 +157,7 @@ public class Contents {
public final Content prevModuleLabel;
public final Content prevPackageLabel;
public final Content properties;
+ public final Content propertyLabel;
public final Content propertyDetailsLabel;
public final Content propertySummary;
public final Content seeLabel;
@@ -152,7 +167,9 @@ public class Contents {
public final Content subinterfacesLabel;
public final Content summaryLabel;
public final Content treeLabel;
+ public final Content typeLabel;
public final Content useLabel;
+ public final Content valueLabel;
private final Resources resources;
@@ -171,15 +188,20 @@ public class Contents {
allPackagesLabel = getNonBreakContent("doclet.All_Packages");
allSuperinterfacesLabel = getContent("doclet.All_Superinterfaces");
also = getContent("doclet.also");
+ annotationTypeOptionalMemberLabel = getContent("doclet.Annotation_Type_Optional_Member");
+ annotationTypeRequiredMemberLabel = getContent("doclet.Annotation_Type_Required_Member");
annotateTypeOptionalMemberSummaryLabel = getContent("doclet.Annotation_Type_Optional_Member_Summary");
annotateTypeRequiredMemberSummaryLabel = getContent("doclet.Annotation_Type_Required_Member_Summary");
annotationType = getContent("doclet.AnnotationType");
annotationTypeDetailsLabel = getContent("doclet.Annotation_Type_Member_Detail");
annotationTypeMemberDetail = getContent("doclet.Annotation_Type_Member_Detail");
annotationTypes = getContent("doclet.AnnotationTypes");
+ annotationtypes = getContent("doclet.annotationtypes");
classLabel = getContent("doclet.Class");
classes = getContent("doclet.Classes");
+ constantFieldLabel = getContent("doclet.ConstantField");
constantsSummaryTitle = getContent("doclet.Constants_Summary");
+ constructorLabel = getContent("doclet.Constructor");
constructorDetailsLabel = getContent("doclet.Constructor_Detail");
constructorSummaryLabel = getContent("doclet.Constructor_Summary");
constructors = getContent("doclet.Constructors");
@@ -196,16 +218,21 @@ public class Contents {
detailLabel = getContent("doclet.Detail");
enclosingClassLabel = getContent("doclet.Enclosing_Class");
enclosingInterfaceLabel = getContent("doclet.Enclosing_Interface");
+ enumConstantLabel = getContent("doclet.Enum_Constant");
enumConstantDetailLabel = getContent("doclet.Enum_Constant_Detail");
enumConstantSummary = getContent("doclet.Enum_Constant_Summary");
enum_ = getContent("doclet.Enum");
enums = getContent("doclet.Enums");
+ error = getContent("doclet.Error");
errors = getContent("doclet.Errors");
+ exception = getContent("doclet.Exception");
exceptions = getContent("doclet.Exceptions");
fieldDetailsLabel = getContent("doclet.Field_Detail");
fieldSummaryLabel = getContent("doclet.Field_Summary");
+ fieldLabel = getContent("doclet.Field");
fields = getContent("doclet.Fields");
framesLabel = getContent("doclet.Frames");
+ fromLabel = getContent("doclet.From");
functionalInterface = getContent("doclet.Functional_Interface");
functionalInterfaceMessage = getContent("doclet.Functional_Interface_Message");
helpLabel = getContent("doclet.Help");
@@ -215,11 +242,15 @@ public class Contents {
inClass = getContent("doclet.in_class");
inInterface = getContent("doclet.in_interface");
indexLabel = getContent("doclet.Index");
+ interfaceLabel = getContent("doclet.Interface");
interfaces = getContent("doclet.Interfaces");
interfacesItalic = getContent("doclet.Interfaces_Italic");
methodDetailLabel = getContent("doclet.Method_Detail");
methodSummary = getContent("doclet.Method_Summary");
+ methodLabel = getContent("doclet.Method");
methods = getContent("doclet.Methods");
+ modifierLabel = getContent("doclet.Modifier");
+ modifierAndTypeLabel = getContent("doclet.Modifier_and_Type");
moduleLabel = getContent("doclet.Module");
module_ = getContent("doclet.module");
moduleSubNavLabel = getContent("doclet.Module_Sub_Nav");
@@ -258,6 +289,7 @@ public class Contents {
prevModuleLabel = getNonBreakContent("doclet.Prev_Module");
prevPackageLabel = getNonBreakContent("doclet.Prev_Package");
properties = getContent("doclet.Properties");
+ propertyLabel = getContent("doclet.Property");
propertyDetailsLabel = getContent("doclet.Property_Detail");
propertySummary = getContent("doclet.Property_Summary");
seeLabel = getContent("doclet.See");
@@ -267,7 +299,9 @@ public class Contents {
subinterfacesLabel = getContent("doclet.Subinterfaces");
summaryLabel = getContent("doclet.Summary");
treeLabel = getContent("doclet.Tree");
+ typeLabel = getContent("doclet.Type");
useLabel = getContent("doclet.navClassUse");
+ valueLabel = getContent("doclet.Value");
}
/**
@@ -286,7 +320,6 @@ public class Contents {
* a given key in the doclet's resources, formatted with
* given arguments.
*
- * @param key the key to look for in the configuration fil
* @param key the key for the desired string
* @param o0 string or content argument to be formatted into the result
* @return a content tree for the text
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
index 96ed61d3a96..db9f7cfa938 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
@@ -25,7 +25,6 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List;
import java.util.SortedSet;
@@ -286,13 +285,11 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
for (DeprElementKind kind : DeprElementKind.values()) {
if (deprapi.hasDocumentation(kind)) {
addAnchor(deprapi, kind, div);
- memberTableSummary
- = resources.getText("doclet.Member_Table_Summary",
- resources.getText(getHeadingKey(kind)),
- resources.getText(getSummaryKey(kind)));
- List memberTableHeader = new ArrayList<>();
- memberTableHeader.add(resources.getText(getHeaderKey(kind)));
- memberTableHeader.add(resources.getText("doclet.Description"));
+ memberTableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText(getHeadingKey(kind)),
+ resources.getText(getSummaryKey(kind)));
+ TableHeader memberTableHeader = new TableHeader(
+ contents.getContent(getHeaderKey(kind)), contents.descriptionLabel);
addDeprecatedAPI(deprapi.getSet(kind),
getHeadingKey(kind), memberTableSummary, memberTableHeader, div);
}
@@ -405,13 +402,13 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
* @param contentTree the content tree to which the deprecated table will be added
*/
protected void addDeprecatedAPI(SortedSet deprList, String headingKey,
- String tableSummary, List tableHeader, Content contentTree) {
+ String tableSummary, TableHeader tableHeader, Content contentTree) {
if (deprList.size() > 0) {
Content caption = getTableCaption(configuration.getContent(headingKey));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
: HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
- table.addContent(getSummaryTableHeader(tableHeader, "col"));
+ table.addContent(tableHeader.toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = true;
for (Element e : deprList) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
index 26a2c264499..0fc3d1b2556 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
@@ -213,10 +214,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(resources.getText("doclet.Enum_Constant"),
- resources.getText("doclet.Description"));
- return header;
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.enumConstantLabel, contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
index 21484dc1493..26b89f5ffa5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
@@ -25,13 +25,11 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.Arrays;
-import java.util.List;
-
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -212,10 +210,9 @@ public class FieldWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Field"), resources.getText("doclet.Description"));
- return header;
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.modifierAndTypeLabel, contents.fieldLabel,
+ contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 11b453de470..f8214c6322d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -75,12 +75,10 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeWriter;
import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
-import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.PackageSummaryWriter;
@@ -94,7 +92,9 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
+import jdk.javadoc.internal.doclets.toolkit.util.GroupTypes;
import jdk.javadoc.internal.doclets.toolkit.util.ImplementedMethods;
+import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes.TableTabs;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
@@ -390,46 +390,6 @@ public class HtmlDocletWriter extends HtmlDocWriter {
DocPaths.moduleSummary(mdle)), label, "", target);
}
- public void addClassesSummary(SortedSet classes, String label,
- String tableSummary, List tableHeader, Content summaryContentTree) {
- if (!classes.isEmpty()) {
- Content caption = getTableCaption(new RawHtml(label));
- Content table = (configuration.isOutputHtml5())
- ? HtmlTree.TABLE(HtmlStyle.typeSummary, caption)
- : HtmlTree.TABLE(HtmlStyle.typeSummary, tableSummary, caption);
- table.addContent(getSummaryTableHeader(tableHeader, "col"));
- Content tbody = new HtmlTree(HtmlTag.TBODY);
- boolean altColor = true;
- for (TypeElement te : classes) {
- if (!utils.isCoreClass(te) ||
- !configuration.isGeneratedDoc(te)) {
- continue;
- }
- Content classContent = getLink(new LinkInfoImpl(
- configuration, LinkInfoImpl.Kind.PACKAGE, te));
- Content tdClass = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, classContent);
- HtmlTree tr = HtmlTree.TR(tdClass);
- tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
- altColor = !altColor;
- HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
- tdClassDescription.addStyle(HtmlStyle.colLast);
- if (utils.isDeprecated(te)) {
- tdClassDescription.addContent(getDeprecatedPhrase(te));
- List tags = utils.getDeprecatedTrees(te);
- if (!tags.isEmpty()) {
- addSummaryDeprecatedComment(te, tags.get(0), tdClassDescription);
- }
- } else {
- addSummaryComment(te, tdClassDescription);
- }
- tr.addContent(tdClassDescription);
- tbody.addContent(tr);
- }
- table.addContent(tbody);
- summaryContentTree.addContent(table);
- }
- }
-
/**
* Generates the HTML document tree and prints it out.
*
@@ -938,42 +898,10 @@ public class HtmlDocletWriter extends HtmlDocWriter {
liNav.addContent(Contents.SPACE);
}
- /**
- * Get summary table header.
- *
- * @param header the header for the table
- * @param scope the scope of the headers
- * @return a content tree for the header
- */
- public Content getSummaryTableHeader(List header, String scope) {
- Content tr = new HtmlTree(HtmlTag.TR);
- final int size = header.size();
- Content tableHeader;
- if (size == 2) {
- tableHeader = new StringContent(header.get(0));
- tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
- tableHeader = new StringContent(header.get(1));
- tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
- return tr;
- }
- for (int i = 0; i < size; i++) {
- tableHeader = new StringContent(header.get(i));
- if (i == 0)
- tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
- else if (i == 1)
- tr.addContent(HtmlTree.TH(HtmlStyle.colSecond, scope, tableHeader));
- else if (i == (size - 1))
- tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
- else
- tr.addContent(HtmlTree.TH(scope, tableHeader));
- }
- return tr;
- }
-
/**
* Get table caption.
*
- * @param rawText the caption for the table which could be raw Html
+ * @param title the content for the caption
* @return a content tree for the caption
*/
public Content getTableCaption(Content title) {
@@ -985,6 +913,73 @@ public class HtmlDocletWriter extends HtmlDocWriter {
return caption;
}
+ /**
+ * Get table header.
+ *
+ * @param caption the table caption
+ * @param tableSummary the summary for the table
+ * @param tableStyle the table style
+ * @return a content object
+ */
+ public Content getTableHeader(Content caption, String tableSummary, HtmlStyle tableStyle) {
+ Content table = (configuration.isOutputHtml5())
+ ? HtmlTree.TABLE(tableStyle, caption)
+ : HtmlTree.TABLE(tableStyle, tableSummary, caption);
+ return table;
+ }
+
+ /**
+ * Get the summary table caption.
+ *
+ * @param groupTypes the group types for table tabs
+ * @return the caption for the summary table
+ */
+ public Content getTableCaption(GroupTypes groupTypes) {
+ Content tabbedCaption = new HtmlTree(HtmlTag.CAPTION);
+ Map groups = groupTypes.getGroupTypes();
+ for (String group : groups.keySet()) {
+ Content captionSpan;
+ Content span;
+ TableTabs tab = groups.get(group);
+ if (tab.isDefaultTab()) {
+ captionSpan = HtmlTree.SPAN(new StringContent(tab.resourceKey()));
+ span = HtmlTree.SPAN(tab.tabId(),
+ HtmlStyle.activeTableTab, captionSpan);
+ } else {
+ captionSpan = HtmlTree.SPAN(getGroupTypeLinks(groupTypes, group));
+ span = HtmlTree.SPAN(tab.tabId(),
+ HtmlStyle.tableTab, captionSpan);
+ }
+ Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, Contents.SPACE);
+ span.addContent(tabSpan);
+ tabbedCaption.addContent(span);
+ }
+ return tabbedCaption;
+ }
+
+ /**
+ * Get the group type links for the table caption.
+ *
+ * @param groupTypes the group types for table tabs
+ * @param groupName the group name to be displayed as link
+ * @return the content tree for the group type link
+ */
+ public Content getGroupTypeLinks(GroupTypes groupTypes, String groupName) {
+ String jsShow = "javascript:showGroups(" + groupTypes.getTableTab(groupName).value() + ");";
+ HtmlTree link = HtmlTree.A(jsShow, new StringContent(groupTypes.getTableTab(groupName).resourceKey()));
+ return link;
+ }
+
+ /**
+ * Returns true if the table tabs needs to be displayed.
+ *
+ * @param groupTypes the group types for table tabs
+ * @return true if the tabs should be displayed
+ */
+ public boolean showTabs(GroupTypes groupTypes) {
+ return groupTypes.getGroupTypes().size() > 1;
+ }
+
/**
* Get the marker anchor which will be added to the documentation tree.
*
@@ -2615,13 +2610,7 @@ public class HtmlDocletWriter extends HtmlDocWriter {
}.visit(annotationValue);
}
- /**
- * Return the configuration for this doclet.
- *
- * @return the configuration for this doclet.
- */
- @Override
- public BaseConfiguration configuration() {
- return configuration;
+ protected TableHeader getPackageTableHeader() {
+ return new TableHeader(contents.packageLabel, contents.descriptionLabel);
}
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index 5a474dfc549..635f0452747 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -29,7 +29,6 @@ import jdk.javadoc.internal.doclets.formats.html.markup.Comment;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
index 04c453fa2bb..fc1626a19ae 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
@@ -35,6 +35,7 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -259,10 +260,9 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Method"), resources.getText("doclet.Description"));
- return header;
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.modifierAndTypeLabel, contents.methodLabel,
+ contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
index c856609f891..70cef546070 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
@@ -25,7 +25,6 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -82,8 +81,7 @@ public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter {
/**
* {@inheritDoc}
*/
- protected void addModulesList(Collection modules, String text,
- String tableSummary, Content body) {
+ protected void addModulesList(Content body) {
Content heading = HtmlTree.HEADING(HtmlConstants.MODULE_HEADING, true,
contents.modulesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
@@ -91,7 +89,7 @@ public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter {
: HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(contents.modulesLabel);
- for (ModuleElement mdle: modules) {
+ for (ModuleElement mdle: configuration.modules) {
ul.addContent(getModuleLink(mdle));
}
htmlTree.addContent(ul);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
index 255bcef04ea..ef5488ac1c5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -30,17 +30,18 @@ import java.util.*;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.Group;
+import jdk.javadoc.internal.doclets.toolkit.util.GroupTypes;
/**
* Generate the module index page "overview-summary.html" for the right-hand
@@ -63,9 +64,19 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
private final Map> groupModuleMap;
/**
- * List to store the order groups as specified on the command line.
+ * List to store the order groups, which has elements to be displayed, as specified on the command line.
*/
- private final List groupList;
+ private final List groupList = new ArrayList<>();
+
+ private final GroupTypes groupTypes;
+
+ private int groupTypesOr = 0;
+
+ protected Map groupTypeMap = new LinkedHashMap<>();
+
+ boolean altColor = true;
+
+ int counter = 0;
/**
* HTML tree for main tag.
@@ -80,7 +91,10 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
public ModuleIndexWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
groupModuleMap = configuration.group.groupModules(configuration.modules);
- groupList = configuration.group.getGroupList();
+ configuration.group.getGroupList().stream()
+ .filter(groupModuleMap::containsKey)
+ .forEach(groupList::add);
+ groupTypes = new GroupTypes(groupList, resources.getText("doclet.All_Modules"));
}
/**
@@ -102,24 +116,15 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
*/
@Override
protected void addIndex(Content body) {
- for (String groupname : groupList) {
- SortedSet list = groupModuleMap.get(groupname);
- if (list != null && !list.isEmpty()) {
- addIndexContents(list,
- groupname, configuration.getText("doclet.Member_Table_Summary",
- groupname, configuration.getText("doclet.modules")), body);
- }
- }
+ addIndexContents(body);
}
/**
* Adds module index contents.
*
- * @param title the title of the section
- * @param tableSummary summary for the table
* @param body the document tree to which the index contents will be added
*/
- protected void addIndexContents(Collection modules, String title, String tableSummary, Content body) {
+ protected void addIndexContents(Content body) {
HtmlTree htmltree = (configuration.allowTag(HtmlTag.NAV))
? HtmlTree.NAV()
: new HtmlTree(HtmlTag.DIV);
@@ -131,43 +136,59 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
}
htmltree.addContent(ul);
body.addContent(htmltree);
- addModulesList(modules, title, tableSummary, body);
+ addModulesList(body);
}
/**
* Add the list of modules.
*
- * @param text The table caption
- * @param tableSummary the summary of the table tag
* @param body the content tree to which the module list will be added
*/
- protected void addModulesList(Collection modules, String text, String tableSummary, Content body) {
- Content table = (configuration.isOutputHtml5())
- ? HtmlTree.TABLE(HtmlStyle.overviewSummary, getTableCaption(new RawHtml(text)))
- : HtmlTree.TABLE(HtmlStyle.overviewSummary, tableSummary, getTableCaption(new RawHtml(text)));
- table.addContent(getSummaryTableHeader(moduleTableHeader, "col"));
- Content tbody = new HtmlTree(HtmlTag.TBODY);
- addModulesList(modules, tbody);
- table.addContent(tbody);
- Content anchor = getMarkerAnchor(text);
- Content div = HtmlTree.DIV(HtmlStyle.contentContainer, anchor);
- div.addContent(table);
- if (configuration.allowTag(HtmlTag.MAIN)) {
- htmlTree.addContent(div);
- } else {
- body.addContent(div);
+ protected void addModulesList(Content body) {
+ if (!groupList.isEmpty()) {
+ Content caption;
+ TreeMap groupMap = new TreeMap<>(utils.makeModuleComparator());
+ Content tbody = new HtmlTree(HtmlTag.TBODY);
+ String tableSummary = configuration.getText("doclet.Member_Table_Summary",
+ configuration.getText("doclet.Module_Summary"), configuration.getText("doclet.modules"));
+ for (String groupname : groupList) {
+ for (ModuleElement mdle : groupModuleMap.get(groupname)) {
+ groupMap.put(mdle, groupname);
+ }
+ }
+ if (!groupMap.isEmpty()) {
+ addModulesList(groupMap, tbody);
+ }
+ if (showTabs(groupTypes)) {
+ caption = getTableCaption(groupTypes);
+ generateGroupTypesScript(groupTypeMap, groupTypes.getGroupTypes());
+ } else {
+ caption = getTableCaption((groupList.size() == 1) ? new StringContent(groupList.get(0)) : contents.modulesLabel);
+ }
+ Content table = getTableHeader(caption, tableSummary, HtmlStyle.overviewSummary);
+ Content header = new TableHeader(contents.moduleLabel, contents.descriptionLabel).toContent();
+ table.addContent(header);
+ table.addContent(tbody);
+ Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table);
+ if (configuration.allowTag(HtmlTag.MAIN)) {
+ htmlTree.addContent(div);
+ } else {
+ body.addContent(div);
+ }
}
}
/**
* Adds list of modules in the index table. Generate link to each module.
*
+ * @param map map of module elements and group names
* @param tbody the documentation tree to which the list will be added
*/
- protected void addModulesList(Collection modules, Content tbody) {
- boolean altColor = true;
- for (ModuleElement mdle : modules) {
+ protected void addModulesList(TreeMap map, Content tbody) {
+ String groupname;
+ for (ModuleElement mdle : map.keySet()) {
if (!mdle.isUnnamed()) {
+ groupname = map.get(mdle);
Content moduleLinkContent = getModuleLink(mdle, new StringContent(mdle.getQualifiedName().toString()));
Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent);
HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
@@ -176,6 +197,12 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter {
HtmlTree tr = HtmlTree.TR(thModule);
tr.addContent(tdSummary);
tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+ int groupType = groupTypes.getTableTab(groupname).value();
+ groupTypesOr = groupTypesOr | groupType;
+ String tableId = "i" + counter;
+ counter++;
+ groupTypeMap.put(tableId, groupType);
+ tr.addAttr(HtmlAttr.ID, tableId);
tbody.addContent(tr);
}
altColor = !altColor;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
index 436a104be55..2d58f62c7be 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
@@ -26,7 +26,6 @@
package jdk.javadoc.internal.doclets.formats.html;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -176,8 +175,10 @@ public class ModulePackageIndexFrameWriter extends AbstractModuleIndexWriter {
protected void addOverviewHeader(Content body) {
}
- protected void addModulesList(Collection modules, String text,
- String tableSummary, Content body) {
+ /**
+ * Do nothing as there is no modules list on this page.
+ */
+ protected void addModulesList(Content body) {
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index 01c2ed85bed..574ce4ce346 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -457,14 +457,15 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
* @param heading the heading for the section
* @param htmltree the content tree to which the information is added
*/
- public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading, Content htmltree) {
+ public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
+ Content htmltree) {
htmltree.addContent(startMarker);
htmltree.addContent(getMarkerAnchor(markerAnchor));
htmltree.addContent(HtmlTree.HEADING(HtmlTag.H3, heading));
}
/**
- * Get table header.
+ * Get a table.
*
* @param text the table caption
* @param tableSummary the summary for the table
@@ -472,13 +473,13 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
* @param tableHeader the table header
* @return a content object
*/
- public Content getTableHeader(String text, String tableSummary, HtmlStyle tableStyle,
- List tableHeader) {
- return getTableHeader(getTableCaption(new RawHtml(text)), tableSummary, tableStyle, tableHeader);
+ Content getTable(String text, String tableSummary, HtmlStyle tableStyle,
+ TableHeader tableHeader) {
+ return getTable(getTableCaption(new RawHtml(text)), tableSummary, tableStyle, tableHeader);
}
/**
- * Get table header.
+ * Get a table.
*
* @param caption the table caption
* @param tableSummary the summary for the table
@@ -486,20 +487,24 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
* @param tableHeader the table header
* @return a content object
*/
- public Content getTableHeader(Content caption, String tableSummary, HtmlStyle tableStyle,
- List tableHeader) {
+ Content getTable(Content caption, String tableSummary, HtmlStyle tableStyle,
+ TableHeader tableHeader) {
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(tableStyle, caption)
: HtmlTree.TABLE(tableStyle, tableSummary, caption);
- table.addContent(getSummaryTableHeader(tableHeader, "col"));
+ table.addContent(tableHeader.toContent());
return table;
}
/**
* {@inheritDoc}
*/
+ @Override
public void addModulesSummary(Content summaryContentTree) {
if (display(requires) || display(indirectModules)) {
+ TableHeader requiresTableHeader =
+ new TableHeader(contents.modifierLabel, contents.moduleLabel,
+ contents.descriptionLabel);
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.addStyle(HtmlStyle.blockList);
addSummaryHeader(HtmlConstants.START_OF_MODULES_SUMMARY, SectionName.MODULES,
@@ -507,9 +512,10 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
if (display(requires)) {
String text = configuration.getText("doclet.Requires_Summary");
String tableSummary = configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Requires_Summary"),
+ text,
configuration.getText("doclet.modules"));
- Content table = getTableHeader(text, tableSummary, HtmlStyle.requiresSummary, requiresTableHeader);
+ Content table = getTable(text, tableSummary, HtmlStyle.requiresSummary,
+ requiresTableHeader);
Content tbody = new HtmlTree(HtmlTag.TBODY);
addModulesList(requires, tbody);
table.addContent(tbody);
@@ -519,9 +525,10 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
if (display(indirectModules)) {
String amrText = configuration.getText("doclet.Indirect_Requires_Summary");
String amrTableSummary = configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Indirect_Requires_Summary"),
+ amrText,
configuration.getText("doclet.modules"));
- Content amrTable = getTableHeader(amrText, amrTableSummary, HtmlStyle.requiresSummary, requiresTableHeader);
+ Content amrTable = getTable(amrText, amrTableSummary, HtmlStyle.requiresSummary,
+ requiresTableHeader);
Content amrTbody = new HtmlTree(HtmlTag.TBODY);
addModulesList(indirectModules, amrTbody);
amrTable.addContent(amrTbody);
@@ -556,6 +563,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
}
}
+ @Override
public void addPackagesSummary(Content summaryContentTree) {
if (display(exportedPackages) || display(openedPackages) || display(concealedPackages)
|| display(indirectPackages) || display(indirectOpenPackages)) {
@@ -569,14 +577,16 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
if (display(exportedPackages) || display(openedPackages) || display(concealedPackages)) {
addPackageSummary(tableSummary, li);
}
+ TableHeader indirectPackagesHeader =
+ new TableHeader(contents.fromLabel, contents.packagesLabel);
if (display(indirectPackages)) {
String aepText = configuration.getText("doclet.Indirect_Exports_Summary");
String aepTableSummary = configuration.getText("doclet.Indirect_Packages_Table_Summary",
- configuration.getText("doclet.Indirect_Exports_Summary"),
+ aepText,
configuration.getText("doclet.modules"),
configuration.getText("doclet.packages"));
- Content aepTable = getTableHeader(aepText, aepTableSummary, HtmlStyle.packagesSummary,
- indirectPackagesTableHeader);
+ Content aepTable = getTable(aepText, aepTableSummary, HtmlStyle.packagesSummary,
+ indirectPackagesHeader);
Content aepTbody = new HtmlTree(HtmlTag.TBODY);
addIndirectPackages(aepTbody, indirectPackages);
aepTable.addContent(aepTbody);
@@ -585,11 +595,11 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
if (display(indirectOpenPackages)) {
String aopText = configuration.getText("doclet.Indirect_Opens_Summary");
String aopTableSummary = configuration.getText("doclet.Indirect_Packages_Table_Summary",
- configuration.getText("doclet.Indirect_Opens_Summary"),
+ aopText,
configuration.getText("doclet.modules"),
configuration.getText("doclet.packages"));
- Content aopTable = getTableHeader(aopText, aopTableSummary, HtmlStyle.packagesSummary,
- indirectPackagesTableHeader);
+ Content aopTable = getTable(aopText, aopTableSummary, HtmlStyle.packagesSummary,
+ indirectPackagesHeader);
Content aopTbody = new HtmlTree(HtmlTag.TBODY);
addIndirectPackages(aopTbody, indirectOpenPackages);
aopTable.addContent(aopTbody);
@@ -616,7 +626,10 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
ModulePackageTypes type = modulePackageTypes.iterator().next();
caption = getTableCaption(configuration.getContent(type.tableTabs().resourceKey()));
}
- Content table = getTableHeader(caption, tableSummary, HtmlStyle.packagesSummary, exportedPackagesTableHeader);
+ TableHeader header = (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
+ ? new TableHeader(contents.packageLabel, contents.moduleLabel, contents.descriptionLabel)
+ : new TableHeader(contents.packageLabel, contents.descriptionLabel);
+ Content table = getTable(caption, tableSummary, HtmlStyle.packagesSummary, header);
table.addContent(tbody);
li.addContent(table);
}
@@ -698,20 +711,20 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
HtmlTree tdModules = new HtmlTree(HtmlTag.TD);
tdModules.addStyle(HtmlStyle.colSecond);
tdModules.addContent(configuration.getText("doclet.None"));
- HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
- tdSummary.addStyle(HtmlStyle.colLast);
+ HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
+ tdSummary.addStyle(HtmlStyle.colLast);
addSummaryComment(pkg, tdSummary);
- HtmlTree tr = HtmlTree.TR(thPackage);
+ HtmlTree tr = HtmlTree.TR(thPackage);
tr.addContent(tdModules);
- tr.addContent(tdSummary);
- tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+ tr.addContent(tdSummary);
+ tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
int pkgType = ModulePackageTypes.CONCEALED.tableTabs().value();
packageTypesOr = packageTypesOr | pkgType;
String tableId = "i" + counter;
counter++;
typeMap.put(tableId, pkgType);
tr.addAttr(HtmlAttr.ID, tableId);
- tbody.addContent(tr);
+ tbody.addContent(tr);
altColor = !altColor;
}
}
@@ -793,6 +806,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
/**
* {@inheritDoc}
*/
+ @Override
public void addServicesSummary(Content summaryContentTree) {
boolean haveUses = displayServices(uses, usesTrees);
@@ -803,14 +817,14 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
li.addStyle(HtmlStyle.blockList);
addSummaryHeader(HtmlConstants.START_OF_SERVICES_SUMMARY, SectionName.SERVICES,
contents.navServices, li);
- String text;
- String tableSummary;
+ TableHeader usesProvidesTableHeader =
+ new TableHeader(contents.typeLabel, contents.descriptionLabel);
if (haveProvides) {
- text = configuration.getText("doclet.Provides_Summary");
- tableSummary = configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Provides_Summary"),
- configuration.getText("doclet.types"));
- Content table = getTableHeader(text, tableSummary, HtmlStyle.providesSummary, providesTableHeader);
+ String label = resources.getText("doclet.Provides_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ label, resources.getText("doclet.types"));
+ Content table = getTable(label, tableSummary, HtmlStyle.providesSummary,
+ usesProvidesTableHeader);
Content tbody = new HtmlTree(HtmlTag.TBODY);
addProvidesList(tbody);
if (!tbody.isEmpty()) {
@@ -819,11 +833,11 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
}
}
if (haveUses){
- text = configuration.getText("doclet.Uses_Summary");
- tableSummary = configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Uses_Summary"),
- configuration.getText("doclet.types"));
- Content table = getTableHeader(text, tableSummary, HtmlStyle.usesSummary, usesTableHeader);
+ String label = resources.getText("doclet.Uses_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ label, resources.getText("doclet.types"));
+ Content table = getTable(label, tableSummary, HtmlStyle.usesSummary,
+ usesProvidesTableHeader);
Content tbody = new HtmlTree(HtmlTag.TBODY);
addUsesList(tbody);
if (!tbody.isEmpty()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
index 2e7fc9b061f..27ef25d9100 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@@ -25,12 +25,10 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.Arrays;
-import java.util.List;
-
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
@@ -77,6 +75,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
+ @Override
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
writer.addMemberTree(memberSummaryTree, memberTree);
}
@@ -113,14 +112,14 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
+ public TableHeader getSummaryTableHeader(Element member) {
if (utils.isInterface(member)) {
- return Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Interface"), resources.getText("doclet.Description"));
+ return new TableHeader(contents.modifierAndTypeLabel, contents.interfaceLabel,
+ contents.descriptionLabel);
} else {
- return Arrays.asList(writer.getModifierTypeHeader(),
- resources.getText("doclet.Class"), resources.getText("doclet.Description"));
+ return new TableHeader(contents.modifierAndTypeLabel, contents.classLabel,
+ contents.descriptionLabel);
}
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java
index 9d89efc371c..f4824c0d62b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java
@@ -78,8 +78,7 @@ public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
* {@inheritDoc}
*/
@Override
- protected void addPackagesList(Collection packages, String text,
- String tableSummary, Content body) {
+ protected void addPackagesList(Content body) {
Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
contents.packagesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
index 73b0638e740..effde857ca2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
@@ -29,17 +29,17 @@ import java.util.*;
import javax.lang.model.element.PackageElement;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.Group;
+import jdk.javadoc.internal.doclets.toolkit.util.GroupTypes;
/**
* Generate the package index page "overview-summary.html" for the right-hand
@@ -65,9 +65,19 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
private final Map> groupPackageMap;
/**
- * List to store the order groups as specified on the command line.
+ * List to store the order groups, which has elements to be displayed, as specified on the command line.
*/
- private final List groupList;
+ private final List groupList = new ArrayList<>();
+
+ private final GroupTypes groupTypes;
+
+ private int groupTypesOr = 0;
+
+ protected Map groupTypeMap = new LinkedHashMap<>();
+
+ boolean altColor = true;
+
+ int counter = 0;
/**
* HTML tree for main tag.
@@ -86,7 +96,10 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
public PackageIndexWriter(HtmlConfiguration configuration, DocPath filename) {
super(configuration, filename);
groupPackageMap = configuration.group.groupPackages(packages);
- groupList = configuration.group.getGroupList();
+ configuration.group.getGroupList().stream()
+ .filter(groupPackageMap::containsKey)
+ .forEachOrdered(groupList::add);
+ groupTypes = new GroupTypes(groupList, resources.getText("doclet.All_Packages"));
}
/**
@@ -109,50 +122,58 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
*/
@Override
protected void addIndex(Content body) {
- for (String groupname : groupList) {
- SortedSet list = groupPackageMap.get(groupname);
- if (list != null && !list.isEmpty()) {
- addIndexContents(list,
- groupname, configuration.getText("doclet.Member_Table_Summary",
- groupname, configuration.getText("doclet.packages")), body);
- }
- }
+ addIndexContents(body);
}
/**
* {@inheritDoc}
*/
@Override
- protected void addPackagesList(Collection packages, String text,
- String tableSummary, Content body) {
- Content table = (configuration.isOutputHtml5())
- ? HtmlTree.TABLE(HtmlStyle.overviewSummary, getTableCaption(new RawHtml(text)))
- : HtmlTree.TABLE(HtmlStyle.overviewSummary, tableSummary, getTableCaption(new RawHtml(text)));
- table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
- Content tbody = new HtmlTree(HtmlTag.TBODY);
- addPackagesList(packages, tbody);
- table.addContent(tbody);
- Content anchor = getMarkerAnchor(text);
- Content div = HtmlTree.DIV(HtmlStyle.contentContainer, anchor);
- div.addContent(table);
- if (configuration.allowTag(HtmlTag.MAIN)) {
- htmlTree.addContent(div);
- } else {
- body.addContent(div);
+ protected void addPackagesList(Content body) {
+ if (!groupList.isEmpty()) {
+ Content caption;
+ TreeMap groupMap = new TreeMap<>(utils.makePackageComparator());
+ Content tbody = new HtmlTree(HtmlTag.TBODY);
+ String tableSummary = configuration.getText("doclet.Member_Table_Summary",
+ configuration.getText("doclet.Package_Summary"), configuration.getText("doclet.packages"));
+ for (String groupname : groupList) {
+ for (PackageElement pkg : groupPackageMap.get(groupname)) {
+ groupMap.put(pkg, groupname);
+ }
+ }
+ if (!groupMap.isEmpty()) {
+ addPackagesList(groupMap, tbody);
+ }
+ if (showTabs(groupTypes)) {
+ caption = getTableCaption(groupTypes);
+ generateGroupTypesScript(groupTypeMap, groupTypes.getGroupTypes());
+ } else {
+ caption = getTableCaption((groupList.size() == 1) ? new StringContent(groupList.get(0)) : contents.packagesLabel);
+ }
+ Content table = getTableHeader(caption, tableSummary, HtmlStyle.overviewSummary);
+ table.addContent(getPackageTableHeader().toContent());
+ table.addContent(tbody);
+ Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table);
+ if (configuration.allowTag(HtmlTag.MAIN)) {
+ htmlTree.addContent(div);
+ } else {
+ body.addContent(div);
+ }
}
}
/**
* Adds list of packages in the index table. Generate link to each package.
*
- * @param packages Packages to which link is to be generated
+ * @param map map of package elements and group names
* @param tbody the documentation tree to which the list will be added
*/
- protected void addPackagesList(Collection packages, Content tbody) {
- boolean altColor = true;
- for (PackageElement pkg : packages) {
+ protected void addPackagesList(TreeMap map, Content tbody) {
+ String groupname;
+ for (PackageElement pkg : map.keySet()) {
if (!pkg.isUnnamed()) {
if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
+ groupname = map.get(pkg);
Content packageLinkContent = getPackageLink(pkg, getPackageName(pkg));
Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, packageLinkContent);
HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
@@ -161,6 +182,12 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter {
HtmlTree tr = HtmlTree.TR(thPackage);
tr.addContent(tdSummary);
tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+ int groupType = groupTypes.getTableTab(groupname).value();
+ groupTypesOr = groupTypesOr | groupType;
+ String tableId = "i" + counter;
+ counter++;
+ groupTypeMap.put(tableId, groupType);
+ tr.addAttr(HtmlAttr.ID, tableId);
tbody.addContent(tr);
}
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
index 5ca2ac753fd..aaecfd1a75d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
@@ -58,11 +58,15 @@ public class PackageUseWriter extends SubWriterHolderWriter {
final PackageElement packageElement;
final SortedMap> usingPackageToUsedClasses = new TreeMap<>();
protected HtmlTree mainTree = HtmlTree.MAIN();
+ final String packageUseTableSummary;
/**
* Constructor.
*
- * @param filename the file to be generated.
+ * @param configuration the configuration
+ * @param mapper a mapper to provide details of where elements are used
+ * @param filename the file to be generated
+ * @param pkgElement the package element to be documented
*/
public PackageUseWriter(HtmlConfiguration configuration,
ClassUseMapper mapper, DocPath filename,
@@ -89,6 +93,9 @@ public class PackageUseWriter extends SubWriterHolderWriter {
}
}
}
+
+ packageUseTableSummary = resources.getText("doclet.Use_Table_Summary",
+ resources.getText("doclet.packages"));
}
/**
@@ -163,8 +170,8 @@ public class PackageUseWriter extends SubWriterHolderWriter {
getPackageLink(packageElement, utils.getPackageName(packageElement))));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
- : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
- table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
+ : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
+ table.addContent(getPackageTableHeader().toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = true;
for (String pkgname: usingPackageToUsedClasses.keySet()) {
@@ -186,8 +193,8 @@ public class PackageUseWriter extends SubWriterHolderWriter {
* @param contentTree the content tree to which the class list will be added
*/
protected void addClassList(Content contentTree) {
- List classTableHeader = Arrays.asList(
- resources.getText("doclet.Class"), resources.getText("doclet.Description"));
+ TableHeader classTableHeader = new TableHeader(
+ contents.classLabel, contents.descriptionLabel);
for (String packageName : usingPackageToUsedClasses.keySet()) {
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
HtmlTree li = new HtmlTree(HtmlTag.LI);
@@ -204,7 +211,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
: HtmlTree.TABLE(HtmlStyle.useSummary, tableSummary, caption);
- table.addContent(getSummaryTableHeader(classTableHeader, "col"));
+ table.addContent(classTableHeader.toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = true;
for (TypeElement te : usingPackageToUsedClasses.get(packageName)) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index dbdcb52b43e..f10f2d52f79 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -198,22 +198,105 @@ public class PackageWriterImpl extends HtmlDocletWriter
* {@inheritDoc}
*/
@Override
+ public void addInterfaceSummary(SortedSet interfaces, Content summaryContentTree) {
+ String label = resources.getText("doclet.Interface_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Interface_Summary"),
+ resources.getText("doclet.interfaces"));
+ TableHeader tableHeader= new TableHeader(contents.interfaceLabel, contents.descriptionLabel);
+
+ addClassesSummary(interfaces, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addClassSummary(SortedSet classes, Content summaryContentTree) {
+ String label = resources.getText("doclet.Class_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Class_Summary"),
+ resources.getText("doclet.classes"));
+ TableHeader tableHeader= new TableHeader(contents.classLabel, contents.descriptionLabel);
+
+ addClassesSummary(classes, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addEnumSummary(SortedSet enums, Content summaryContentTree) {
+ String label = resources.getText("doclet.Enum_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Enum_Summary"),
+ resources.getText("doclet.enums"));
+ TableHeader tableHeader= new TableHeader(contents.enum_, contents.descriptionLabel);
+
+ addClassesSummary(enums, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addExceptionSummary(SortedSet exceptions, Content summaryContentTree) {
+ String label = resources.getText("doclet.Exception_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Exception_Summary"),
+ resources.getText("doclet.exceptions"));
+ TableHeader tableHeader= new TableHeader(contents.exception, contents.descriptionLabel);
+
+ addClassesSummary(exceptions, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addErrorSummary(SortedSet errors, Content summaryContentTree) {
+ String label = resources.getText("doclet.Error_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Error_Summary"),
+ resources.getText("doclet.errors"));
+ TableHeader tableHeader= new TableHeader(contents.error, contents.descriptionLabel);
+
+ addClassesSummary(errors, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void addAnnotationTypeSummary(SortedSet annoTypes, Content summaryContentTree) {
+ String label = resources.getText("doclet.Annotation_Types_Summary");
+ String tableSummary = resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Annotation_Types_Summary"),
+ resources.getText("doclet.annotationtypes"));
+ TableHeader tableHeader= new TableHeader(contents.annotationType, contents.descriptionLabel);
+
+ addClassesSummary(annoTypes, label, tableSummary, tableHeader, summaryContentTree);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void addClassesSummary(SortedSet classes, String label,
- String tableSummary, List tableHeader, Content summaryContentTree) {
+ String tableSummary, TableHeader tableHeader, Content summaryContentTree) {
if(!classes.isEmpty()) {
Content caption = getTableCaption(new RawHtml(label));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.typeSummary, caption)
: HtmlTree.TABLE(HtmlStyle.typeSummary, tableSummary, caption);
- table.addContent(getSummaryTableHeader(tableHeader, "col"));
+ table.addContent(tableHeader.toContent());
Content tbody = new HtmlTree(HtmlTag.TBODY);
boolean altColor = false;
for (TypeElement klass : classes) {
- altColor = !altColor;
if (!utils.isCoreClass(klass) ||
!configuration.isGeneratedDoc(klass)) {
continue;
}
+ altColor = !altColor;
Content classContent = getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.PACKAGE, klass));
Content thClass = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, classContent);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
index 60d28944604..a550f1271e4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
@@ -25,13 +25,12 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.util.Arrays;
-import java.util.List;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
+import jdk.javadoc.internal.doclets.formats.html.TableHeader;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -66,8 +65,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
- public Content getMemberSummaryHeader(TypeElement typeElement,
- Content memberSummaryTree) {
+ public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
memberSummaryTree.addContent(HtmlConstants.START_OF_PROPERTY_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
@@ -82,6 +80,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
+ @Override
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
writer.addMemberTree(memberSummaryTree, memberTree);
}
@@ -237,10 +236,9 @@ public class PropertyWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
- public List getSummaryTableHeader(Element member) {
- List header = Arrays.asList(resources.getText("doclet.Type"),
- resources.getText("doclet.Property"), resources.getText("doclet.Description"));
- return header;
+ public TableHeader getSummaryTableHeader(Element member) {
+ return new TableHeader(contents.typeLabel, contents.propertyLabel,
+ contents.descriptionLabel);
}
/**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
index 34d69d99c9f..da14dc38615 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@@ -25,7 +25,6 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.io.*;
import java.util.*;
import javax.lang.model.element.Element;
@@ -105,7 +104,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.memberSummary, caption)
: HtmlTree.TABLE(HtmlStyle.memberSummary, mw.getTableSummary(), caption);
- table.addContent(getSummaryTableHeader(mw.getSummaryTableHeader(typeElement), "col"));
+ table.addContent(mw.getSummaryTableHeader(typeElement).toContent());
for (Content tableContent : tableContents) {
table.addContent(tableContent);
}
@@ -356,6 +355,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
*
* @param style the style class to be added to the content tree
* @param contentTree the tree used to generate the complete member tree
+ * @return the member tree
*/
public Content getMemberTree(HtmlStyle style, Content contentTree) {
Content div = HtmlTree.DIV(style, getMemberTree(contentTree));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
new file mode 100644
index 00000000000..424d4810303
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+
+/**
+ * A row header for an HTML table.
+ *
+ * The header contains a list of {@code } cells, providing the column headers.
+ * The attribute {@code scope="col"} is automatically added to each header cell.
+ * In addition, a series of style class names can be specified, to be applied one per cell.
+ *
+ */
+public class TableHeader {
+
+ /**
+ * The content to be put in each of the {@code } cells in the header row.
+ */
+ private final List cellContents;
+ /**
+ * The style class names for each of the {@code } cells in the header row.
+ * If not set, default style names will be used.
+ */
+ private List styles;
+
+ /**
+ * Creates a header row, with localized content for each cell.
+ * Resources keys will be converted to content using {@link Contents#getContent(String)}.
+ * @param contents a factory to get the content for each header cell.
+ * @param colHeaderKeys the resource keys for the content in each cell.
+ */
+ TableHeader(Contents contents, String... colHeaderKeys) {
+ this.cellContents = Arrays.stream(colHeaderKeys)
+ .map((key) -> contents.getContent(key))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Creates a header row, with specified content for each cell.
+ * @param headerCellContents a content object for each header cell
+ */
+ TableHeader(Content... headerCellContents) {
+ this.cellContents = Arrays.asList(headerCellContents);
+ }
+
+ /**
+ * Set the style class names for each header cell.
+ * The number of names must match the number of cells given to the constructor.
+ * @param styles the style class names
+ * @return this object
+ */
+ TableHeader styles(HtmlStyle... styles) {
+ if (styles.length != cellContents.size()) {
+ throw new IllegalStateException();
+ }
+ this.styles = Arrays.asList(styles);
+ return this;
+ }
+
+ /**
+ * Converts this header to a {@link Content} object, for use in an {@link HtmlTree}.
+ * @returns a Content object
+ */
+ Content toContent() {
+ String scope = "col";
+ Content tr = new HtmlTree(HtmlTag.TR);
+ int i = 0;
+ for (Content cellContent : cellContents) {
+ HtmlStyle style = (styles != null) ? styles.get(i)
+ : (i == 0) ? HtmlStyle.colFirst
+ : (i == (cellContents.size() - 1)) ? HtmlStyle.colLast
+ : (i == 1) ? HtmlStyle.colSecond : null;
+ Content cell = (style == null) ? HtmlTree.TH(scope, cellContent)
+ : HtmlTree.TH(style, scope, cellContent);
+ tr.addContent(cell);
+ i++;
+ }
+ return tr;
+ }
+
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java
index a09f243a2bd..e504f959518 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java
@@ -33,7 +33,6 @@ import javax.lang.model.element.TypeElement;
import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
import jdk.javadoc.internal.doclets.formats.html.SectionName;
-import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -78,14 +77,6 @@ public abstract class HtmlDocWriter extends HtmlWriter {
DocFile.createFileForOutput(configuration, filename).getPath());
}
- /**
- * Accessor for configuration.
- * @return the configuration for this doclet
- */
- public BaseConfiguration configuration() {
- return configuration;
- }
-
public Content getHyperLink(DocPath link, String label) {
return getHyperLink(link, new StringContent(label), false, "", "", "");
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java
index 85490bdb9d5..3bf76d57030 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java
@@ -28,8 +28,7 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
import java.io.*;
import java.util.*;
-import jdk.javadoc.doclet.DocletEnvironment.ModuleMode;
-import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -37,6 +36,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes;
+import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes.TableTabs;
/**
@@ -55,59 +55,14 @@ import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes;
public class HtmlWriter {
/**
- * The window title of this file
+ * The window title of this file.
*/
protected String winTitle;
/**
- * The configuration
+ * The configuration.
*/
- protected BaseConfiguration configuration;
-
- /**
- * Header for table displaying modules and description.
- */
- protected final List moduleTableHeader;
-
- /**
- * Header for tables displaying packages and description.
- */
- protected final List packageTableHeader;
-
- /**
- * Header for tables displaying modules and description.
- */
- protected final List requiresTableHeader;
-
- /**
- * Header for tables displaying packages and description.
- */
- protected final List exportedPackagesTableHeader;
-
- /**
- * Header for tables displaying modules and exported packages.
- */
- protected final List indirectPackagesTableHeader;
-
- /**
- * Header for tables displaying types and description.
- */
- protected final List usesTableHeader;
-
- /**
- * Header for tables displaying types and description.
- */
- protected final List providesTableHeader;
-
- /**
- * Summary for use tables displaying class and package use.
- */
- protected final String useTableSummary;
-
- /**
- * Column header for class docs displaying Modifier and Type header.
- */
- protected final String modifierTypeHeader;
+ protected HtmlConfiguration configuration;
private final DocFile docFile;
@@ -117,47 +72,18 @@ public class HtmlWriter {
/**
* Constructor.
*
- * @param path The directory path to be created for this file
- * or null if none to be created.
+ * @param configuration the configuration
+ * @param path the directory path to be created for this file,
+ * or null if none to be created
*/
- public HtmlWriter(BaseConfiguration configuration, DocPath path) {
- docFile = DocFile.createFileForOutput(configuration, path);
+ public HtmlWriter(HtmlConfiguration configuration, DocPath path) {
this.configuration = configuration;
+ docFile = DocFile.createFileForOutput(configuration, path);
// The following should be converted to shared Content objects
// and moved to Contents, but that will require additional
// changes at the use sites.
Resources resources = configuration.getResources();
- moduleTableHeader = Arrays.asList(
- resources.getText("doclet.Module"),
- resources.getText("doclet.Description"));
- packageTableHeader = new ArrayList<>();
- packageTableHeader.add(resources.getText("doclet.Package"));
- packageTableHeader.add(resources.getText("doclet.Description"));
- requiresTableHeader = new ArrayList<>();
- requiresTableHeader.add(resources.getText("doclet.Modifier"));
- requiresTableHeader.add(resources.getText("doclet.Module"));
- requiresTableHeader.add(resources.getText("doclet.Description"));
- exportedPackagesTableHeader = new ArrayList<>();
- exportedPackagesTableHeader.add(resources.getText("doclet.Package"));
- if (configuration.docEnv.getModuleMode() == ModuleMode.ALL) {
- exportedPackagesTableHeader.add(resources.getText("doclet.Module"));
- }
- exportedPackagesTableHeader.add(resources.getText("doclet.Description"));
- indirectPackagesTableHeader = new ArrayList<>();
- indirectPackagesTableHeader.add(resources.getText("doclet.From"));
- indirectPackagesTableHeader.add(resources.getText("doclet.Packages"));
- usesTableHeader = new ArrayList<>();
- usesTableHeader.add(resources.getText("doclet.Type"));
- usesTableHeader.add(resources.getText("doclet.Description"));
- providesTableHeader = new ArrayList<>();
- providesTableHeader.add(resources.getText("doclet.Type"));
- providesTableHeader.add(resources.getText("doclet.Description"));
- useTableSummary = resources.getText("doclet.Use_Table_Summary",
- resources.getText("doclet.packages"));
- modifierTypeHeader = resources.getText("doclet.0_and_1",
- resources.getText("doclet.Modifier"),
- resources.getText("doclet.Type"));
}
public void write(Content c) throws DocFileIOException {
@@ -372,6 +298,52 @@ public class HtmlWriter {
script.addContent(new RawHtml(vars));
}
+ /**
+ * Generated javascript variables for the document.
+ *
+ * @param groupTypeMap map comprising of group relationship
+ * @param groupTypes map comprising of all table tab types
+ */
+ public void generateGroupTypesScript(Map groupTypeMap,
+ Map groupTypes) {
+ String sep = "";
+ StringBuilder vars = new StringBuilder("var groups");
+ vars.append(" = {");
+ for (Map.Entry entry : groupTypeMap.entrySet()) {
+ vars.append(sep);
+ sep = ",";
+ vars.append("\"")
+ .append(entry.getKey())
+ .append("\":")
+ .append(entry.getValue());
+ }
+ vars.append("};").append(DocletConstants.NL);
+ sep = "";
+ vars.append("var tabs = {");
+ for (String group : groupTypes.keySet()) {
+ TableTabs tab = groupTypes.get(group);
+ vars.append(sep);
+ sep = ",";
+ vars.append(tab.value())
+ .append(":")
+ .append("[")
+ .append("\"")
+ .append(tab.tabId())
+ .append("\"")
+ .append(sep)
+ .append("\"")
+ .append(new StringContent(tab.resourceKey()))
+ .append("\"]");
+ }
+ vars.append("};")
+ .append(DocletConstants.NL);
+ addStyles(HtmlStyle.altColor, vars);
+ addStyles(HtmlStyle.rowColor, vars);
+ addStyles(HtmlStyle.tableTab, vars);
+ addStyles(HtmlStyle.activeTableTab, vars);
+ script.addContent(new RawHtml(vars));
+ }
+
/**
* Adds javascript style variables to the document.
*
@@ -392,11 +364,4 @@ public class HtmlWriter {
HtmlTree title = HtmlTree.TITLE(new StringContent(winTitle));
return title;
}
-
- /*
- * Returns a header for Modifier and Type column of a table.
- */
- public String getModifierTypeHeader() {
- return modifierTypeHeader;
- }
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
index d8db2c90178..771ea593fd7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
@@ -564,7 +564,7 @@ public abstract class BaseConfiguration {
new Option(resources, "-linkoffline", 2) {
@Override
public boolean process(String opt, List args) {
- linkOfflineList.add(new Pair(args.get(0), args.get(1)));
+ linkOfflineList.add(new Pair<>(args.get(0), args.get(1)));
return true;
}
},
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
index 415de482e73..f2bb8e34604 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import com.sun.source.doctree.DocTree;
+import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
/**
* The interface for writing member summary output.
@@ -77,7 +78,8 @@ public interface MemberSummaryWriter {
* @param counter the counter for determining id and style for the table row
*/
public void addMemberSummary(TypeElement typeElement, Element member,
- List firstSentenceTags, List tableContents, int counter);
+ List firstSentenceTags, List tableContents, int counter,
+ VisibleMemberMap.Kind vmmKind);
/**
* Get the inherited member summary header for the given class.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
index 889f9cde63f..3f2406940d1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.util.List;
import java.util.SortedSet;
import javax.lang.model.element.TypeElement;
@@ -69,16 +68,58 @@ public interface PackageSummaryWriter {
public abstract Content getSummaryHeader();
/**
- * Adds the table of classes to the documentation tree.
+ * Adds the table of interfaces to the documentation tree.
*
- * @param classes the array of classes to document.
- * @param label the label for this table.
- * @param tableSummary the summary string for the table
- * @param tableHeader array of table headers
+ * @param interfaces the interfaces to document.
* @param summaryContentTree the content tree to which the summaries will be added
*/
- public abstract void addClassesSummary(SortedSet classes, String label,
- String tableSummary, List tableHeader, Content summaryContentTree);
+ public abstract void addInterfaceSummary(SortedSet interfaces,
+ Content summaryContentTree);
+
+ /**
+ * Adds the table of classes to the documentation tree.
+ *
+ * @param classes the classes to document.
+ * @param summaryContentTree the content tree to which the summaries will be added
+ */
+ public abstract void addClassSummary(SortedSet classes,
+ Content summaryContentTree);
+
+ /**
+ * Adds the table of enums to the documentation tree.
+ *
+ * @param enums the enums to document.
+ * @param summaryContentTree the content tree to which the summaries will be added
+ */
+ public abstract void addEnumSummary(SortedSet enums,
+ Content summaryContentTree);
+
+ /**
+ * Adds the table of exceptions to the documentation tree.
+ *
+ * @param exceptions the exceptions to document.
+ * @param summaryContentTree the content tree to which the summaries will be added
+ */
+ public abstract void addExceptionSummary(SortedSet exceptions,
+ Content summaryContentTree);
+
+ /**
+ * Adds the table of errors to the documentation tree.
+ *
+ * @param errors the errors to document.
+ * @param summaryContentTree the content tree to which the summaries will be added
+ */
+ public abstract void addErrorSummary(SortedSet errors,
+ Content summaryContentTree);
+
+ /**
+ * Adds the table of annotation types to the documentation tree.
+ *
+ * @param annoTypes the annotation types to document.
+ * @param summaryContentTree the content tree to which the summaries will be added
+ */
+ public abstract void addAnnotationTypeSummary(SortedSet annoTypes,
+ Content summaryContentTree);
/**
* Adds the package description from the "packages.html" file to the documentation
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
index 27062768010..79d583ebf1e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
@@ -356,7 +356,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
}
}
writer.addMemberSummary(typeElement, member, firstSentenceTags,
- tableContents, counter);
+ tableContents, counter, visibleMemberMap.kind);
counter++;
}
summaryTreeList.add(writer.getSummaryTableTree(typeElement, tableContents));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
index 43ac9836f20..cb4da627f8a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit.builders;
-import java.util.Arrays;
-import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -171,21 +169,12 @@ public class PackageSummaryBuilder extends AbstractBuilder {
* will be added
*/
protected void buildInterfaceSummary(Content summaryContentTree) {
- String interfaceTableSummary =
- configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Interface_Summary"),
- configuration.getText("doclet.interfaces"));
- List interfaceTableHeader = Arrays.asList(configuration.getText("doclet.Interface"),
- configuration.getText("doclet.Description"));
-
SortedSet ilist = utils.isSpecified(packageElement)
? utils.getTypeElementsAsSortedSet(utils.getInterfaces(packageElement))
: configuration.typeElementCatalog.interfaces(packageElement);
SortedSet interfaces = utils.filterOutPrivateClasses(ilist, configuration.javafx);
if (!interfaces.isEmpty()) {
- packageWriter.addClassesSummary(interfaces,
- configuration.getText("doclet.Interface_Summary"),
- interfaceTableSummary, interfaceTableHeader, summaryContentTree);
+ packageWriter.addInterfaceSummary(interfaces, summaryContentTree);
}
}
@@ -196,20 +185,12 @@ public class PackageSummaryBuilder extends AbstractBuilder {
* be added
*/
protected void buildClassSummary(Content summaryContentTree) {
- String classTableSummary =
- configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Class_Summary"),
- configuration.getText("doclet.classes"));
- List classTableHeader = Arrays.asList(configuration.getText("doclet.Class"),
- configuration.getText("doclet.Description"));
SortedSet clist = utils.isSpecified(packageElement)
? utils.getTypeElementsAsSortedSet(utils.getOrdinaryClasses(packageElement))
: configuration.typeElementCatalog.ordinaryClasses(packageElement);
SortedSet classes = utils.filterOutPrivateClasses(clist, configuration.javafx);
if (!classes.isEmpty()) {
- packageWriter.addClassesSummary(classes,
- configuration.getText("doclet.Class_Summary"),
- classTableSummary, classTableHeader, summaryContentTree);
+ packageWriter.addClassSummary(classes, summaryContentTree);
}
}
@@ -220,20 +201,12 @@ public class PackageSummaryBuilder extends AbstractBuilder {
* be added
*/
protected void buildEnumSummary(Content summaryContentTree) {
- String enumTableSummary =
- configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Enum_Summary"),
- configuration.getText("doclet.enums"));
- List