--- a/jdk/src/java.base/share/classes/java/security/AccessControlContext.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/AccessControlContext.java Thu Jul 09 10:37:07 2015 +0300
@@ -76,7 +76,7 @@
public final class AccessControlContext {
- private ProtectionDomain context[];
+ private ProtectionDomain[] context;
// isPrivileged and isAuthorized are referenced by the VM - do not remove
// or change their names
private boolean isPrivileged;
@@ -89,13 +89,13 @@
private DomainCombiner combiner = null;
// limited privilege scope
- private Permission permissions[];
+ private Permission[] permissions;
private AccessControlContext parent;
private boolean isWrapped;
// is constrained by limited privilege scope?
private boolean isLimited;
- private ProtectionDomain limitedContext[];
+ private ProtectionDomain[] limitedContext;
private static boolean debugInit = false;
private static Debug debug = null;
@@ -123,7 +123,7 @@
* changes to the array will not affect this AccessControlContext.
* @throws NullPointerException if {@code context} is {@code null}
*/
- public AccessControlContext(ProtectionDomain context[])
+ public AccessControlContext(ProtectionDomain[] context)
{
if (context.length == 0) {
this.context = null;
@@ -282,7 +282,7 @@
* package private constructor for AccessController.getContext()
*/
- AccessControlContext(ProtectionDomain context[],
+ AccessControlContext(ProtectionDomain[] context,
boolean isPrivileged)
{
this.context = context;
@@ -643,7 +643,7 @@
/*
* Combine the current (stack) and assigned domains.
*/
- private static ProtectionDomain[] combine(ProtectionDomain[]current,
+ private static ProtectionDomain[] combine(ProtectionDomain[] current,
ProtectionDomain[] assigned) {
// current could be null if only system code is on the stack;
@@ -666,7 +666,7 @@
int n = (skipAssigned) ? 0 : assigned.length;
// now we combine both of them, and create a new context
- ProtectionDomain pd[] = new ProtectionDomain[slen + n];
+ ProtectionDomain[] pd = new ProtectionDomain[slen + n];
// first copy in the assigned context domains, no need to compress
if (!skipAssigned) {
@@ -695,7 +695,7 @@
} else if (skipAssigned && n == slen) {
return current;
}
- ProtectionDomain tmp[] = new ProtectionDomain[n];
+ ProtectionDomain[] tmp = new ProtectionDomain[n];
System.arraycopy(pd, 0, tmp, 0, n);
pd = tmp;
}
--- a/jdk/src/java.base/share/classes/java/security/CodeSource.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/CodeSource.java Thu Jul 09 10:37:07 2015 +0300
@@ -65,7 +65,7 @@
/*
* The code signers. Certificate chains are concatenated.
*/
- private transient java.security.cert.Certificate certs[] = null;
+ private transient java.security.cert.Certificate[] certs = null;
// cached SocketPermission used for matchLocation
private transient SocketPermission sp;
@@ -91,7 +91,7 @@
* @param certs the certificate(s). It may be null. The contents of the
* array are copied to protect against subsequent modification.
*/
- public CodeSource(URL url, java.security.cert.Certificate certs[]) {
+ public CodeSource(URL url, java.security.cert.Certificate[] certs) {
this.location = url;
if (url != null) {
this.locationNoFragString = URLUtil.urlNoFragString(url);
--- a/jdk/src/java.base/share/classes/java/security/Permissions.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/Permissions.java Thu Jul 09 10:37:07 2015 +0300
@@ -289,9 +289,9 @@
if (unresolvedPerms == null)
return null;
- java.security.cert.Certificate certs[] = null;
+ java.security.cert.Certificate[] certs = null;
- Object signers[] = p.getClass().getSigners();
+ Object[] signers = p.getClass().getSigners();
int n = 0;
if (signers != null) {
--- a/jdk/src/java.base/share/classes/java/security/SecureRandom.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java Thu Jul 09 10:37:07 2015 +0300
@@ -69,7 +69,7 @@
*
* <pre>
* SecureRandom random = new SecureRandom();
- * byte bytes[] = new byte[20];
+ * byte[] bytes = new byte[20];
* random.nextBytes(bytes);
* </pre>
*
@@ -77,7 +77,7 @@
* to generate a given number of seed bytes (to seed other random number
* generators, for example):
* <pre>
- * byte seed[] = random.generateSeed(20);
+ * byte[] seed = random.generateSeed(20);
* </pre>
*
* Note: Depending on the implementation, the {@code generateSeed} and
@@ -186,7 +186,7 @@
*
* @param seed the seed.
*/
- public SecureRandom(byte seed[]) {
+ public SecureRandom(byte[] seed) {
super(0);
getDefaultPRNG(true, seed);
}
@@ -486,7 +486,7 @@
@Override
final protected int next(int numBits) {
int numBytes = (numBits+7)/8;
- byte b[] = new byte[numBytes];
+ byte[] b = new byte[numBytes];
int next = 0;
nextBytes(b);
--- a/jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/UnresolvedPermission.java Thu Jul 09 10:37:07 2015 +0300
@@ -130,7 +130,7 @@
*/
private String actions;
- private transient java.security.cert.Certificate certs[];
+ private transient java.security.cert.Certificate[] certs;
/**
* Creates a new UnresolvedPermission containing the permission
@@ -152,7 +152,7 @@
public UnresolvedPermission(String type,
String name,
String actions,
- java.security.cert.Certificate certs[])
+ java.security.cert.Certificate[] certs)
{
super(type);
@@ -224,7 +224,7 @@
* try and resolve this permission using the class loader of the permission
* that was passed in.
*/
- Permission resolve(Permission p, java.security.cert.Certificate certs[]) {
+ Permission resolve(Permission p, java.security.cert.Certificate[] certs) {
if (this.certs != null) {
// if p wasn't signed, we don't have a match
if (certs == null) {
--- a/jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java Thu Jul 09 10:37:07 2015 +0300
@@ -54,7 +54,7 @@
private final BigInteger primeExponentP;
private final BigInteger primeExponentQ;
private final BigInteger crtCoefficient;
- private final RSAOtherPrimeInfo otherPrimeInfo[];
+ private final RSAOtherPrimeInfo[] otherPrimeInfo;
/**
* Creates a new {@code RSAMultiPrimePrivateCrtKeySpec}
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java Thu Jul 09 10:37:07 2015 +0300
@@ -507,7 +507,7 @@
// certificates (optional)
if (certificates != null && certificates.length != 0) {
// cast to X509CertImpl[] since X509CertImpl implements DerEncoder
- X509CertImpl implCerts[] = new X509CertImpl[certificates.length];
+ X509CertImpl[] implCerts = new X509CertImpl[certificates.length];
for (int i = 0; i < certificates.length; i++) {
if (certificates[i] instanceof X509CertImpl)
implCerts[i] = (X509CertImpl) certificates[i];
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java Thu Jul 09 10:37:07 2015 +0300
@@ -78,7 +78,7 @@
* data is stored and transmitted losslessly, but no knowledge
* about this particular algorithm is available.
*/
- private PKCS8Key (AlgorithmId algid, byte key [])
+ private PKCS8Key (AlgorithmId algid, byte[] key)
throws InvalidKeyException {
this.algid = algid;
this.key = key;
--- a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Thu Jul 09 10:37:07 2015 +0300
@@ -154,28 +154,28 @@
private static final Debug debug = Debug.getInstance("pkcs12");
- private static final int keyBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 2};
- private static final int certBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 3};
- private static final int secretBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 5};
+ private static final int[] keyBag = {1, 2, 840, 113549, 1, 12, 10, 1, 2};
+ private static final int[] certBag = {1, 2, 840, 113549, 1, 12, 10, 1, 3};
+ private static final int[] secretBag = {1, 2, 840, 113549, 1, 12, 10, 1, 5};
- private static final int pkcs9Name[] = {1, 2, 840, 113549, 1, 9, 20};
- private static final int pkcs9KeyId[] = {1, 2, 840, 113549, 1, 9, 21};
+ private static final int[] pkcs9Name = {1, 2, 840, 113549, 1, 9, 20};
+ private static final int[] pkcs9KeyId = {1, 2, 840, 113549, 1, 9, 21};
- private static final int pkcs9certType[] = {1, 2, 840, 113549, 1, 9, 22, 1};
+ private static final int[] pkcs9certType = {1, 2, 840, 113549, 1, 9, 22, 1};
- private static final int pbeWithSHAAnd40BitRC2CBC[] =
+ private static final int[] pbeWithSHAAnd40BitRC2CBC =
{1, 2, 840, 113549, 1, 12, 1, 6};
- private static final int pbeWithSHAAnd3KeyTripleDESCBC[] =
+ private static final int[] pbeWithSHAAnd3KeyTripleDESCBC =
{1, 2, 840, 113549, 1, 12, 1, 3};
- private static final int pbes2[] = {1, 2, 840, 113549, 1, 5, 13};
+ private static final int[] pbes2 = {1, 2, 840, 113549, 1, 5, 13};
// TODO: temporary Oracle OID
/*
* { joint-iso-itu-t(2) country(16) us(840) organization(1) oracle(113894)
* jdk(746875) crypto(1) id-at-trustedKeyUsage(1) }
*/
- private static final int TrustedKeyUsage[] =
+ private static final int[] TrustedKeyUsage =
{2, 16, 840, 1, 113894, 746875, 1, 1};
- private static final int AnyExtendedKeyUsage[] = {2, 5, 29, 37, 0};
+ private static final int[] AnyExtendedKeyUsage = {2, 5, 29, 37, 0};
private static ObjectIdentifier PKCS8ShroudedKeyBag_OID;
private static ObjectIdentifier CertBag_OID;
@@ -243,7 +243,7 @@
// A private key entry and its supporting certificate chain
private static class PrivateKeyEntry extends KeyEntry {
byte[] protectedPrivKey;
- Certificate chain[];
+ Certificate[] chain;
};
// A secret key
--- a/jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java Thu Jul 09 10:37:07 2015 +0300
@@ -403,7 +403,7 @@
debug.println(" "+perm);
}
} catch (ClassNotFoundException cnfe) {
- Certificate certs[];
+ Certificate[] certs;
if (pe.signedBy != null) {
certs = getCertificates(keyStore, pe.signedBy);
} else {
@@ -623,7 +623,7 @@
init();
}
- final CodeSource codesource[] = {null};
+ final CodeSource[] codesource = {null};
codesource[0] = canonicalizeCodebase(cs, true);
@@ -666,7 +666,7 @@
// now see if any of the keys are trusted ids.
if (!ignoreIdentityScope) {
- Certificate certs[] = codesource[0].getCertificates();
+ Certificate[] certs = codesource[0].getCertificates();
if (certs != null) {
for (int k=0; k < certs.length; k++) {
if (aliasMapping.get(certs[k]) == null &&
--- a/jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/DSAParameterGenerator.java Thu Jul 09 10:37:07 2015 +0300
@@ -237,7 +237,7 @@
BigInteger offset = ONE;
/* Step 11 */
for (counter = 0; counter < 4*valueL; counter++) {
- BigInteger V[] = new BigInteger[n + 1];
+ BigInteger[] V = new BigInteger[n + 1];
/* Step 11.1 */
for (int j = 0; j <= n; j++) {
BigInteger J = BigInteger.valueOf(j);
--- a/jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java Thu Jul 09 10:37:07 2015 +0300
@@ -82,7 +82,7 @@
private static class KeyEntry {
Date date; // the creation date of this entry
byte[] protectedPrivKey;
- Certificate chain[];
+ Certificate[] chain;
};
// Trusted certificates
@@ -604,7 +604,7 @@
* the keystore (such as deleting or modifying key or
* certificate entries).
*/
- byte digest[] = md.digest();
+ byte[] digest = md.digest();
dos.write(digest);
dos.flush();
@@ -770,9 +770,8 @@
* with
*/
if (password != null) {
- byte computed[], actual[];
- computed = md.digest();
- actual = new byte[computed.length];
+ byte[] computed = md.digest();
+ byte[] actual = new byte[computed.length];
dis.readFully(actual);
for (int i = 0; i < computed.length; i++) {
if (computed[i] != actual[i]) {
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java Thu Jul 09 10:37:07 2015 +0300
@@ -795,7 +795,7 @@
// an unresolved permission which will be resolved
// when implies is called
// Add it to entry
- Certificate certs[];
+ Certificate[] certs;
if (pe.signedBy != null) {
certs = getCertificates(keyStore,
pe.signedBy,
@@ -817,7 +817,7 @@
debug.println(" "+perm);
}
} catch (ClassNotFoundException cnfe) {
- Certificate certs[];
+ Certificate[] certs;
if (pe.signedBy != null) {
certs = getCertificates(keyStore,
pe.signedBy,
@@ -2032,7 +2032,7 @@
*
* @serial
*/
- private Certificate certs[];
+ private Certificate[] certs;
/**
* Creates a new SelfPermission containing the permission
@@ -2048,7 +2048,7 @@
* certificate first and the (root) certificate authority last).
*/
public SelfPermission(String type, String name, String actions,
- Certificate certs[])
+ Certificate[] certs)
{
super(type);
if (type == null) {
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java Thu Jul 09 10:37:07 2015 +0300
@@ -1353,7 +1353,7 @@
}
}
- public static void main(String arg[]) throws Exception {
+ public static void main(String[] arg) throws Exception {
try (FileReader fr = new FileReader(arg[0]);
FileWriter fw = new FileWriter(arg[1])) {
PolicyParser pp = new PolicyParser(true);
--- a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java Thu Jul 09 10:37:07 2015 +0300
@@ -85,7 +85,7 @@
*
* @param seed the seed.
*/
- private SecureRandom(byte seed[]) {
+ private SecureRandom(byte[] seed) {
init(seed);
}
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java Thu Jul 09 10:37:07 2015 +0300
@@ -70,7 +70,7 @@
* Increments position().
*/
@Override
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
if (bb == null) {
throw new IOException("read on a closed InputStream");
@@ -85,7 +85,7 @@
* Increments position().
*/
@Override
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
if (bb == null) {
throw new IOException("read on a closed InputStream");
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java Thu Jul 09 10:37:07 2015 +0300
@@ -810,7 +810,7 @@
String alias = null;
int keytypesTmpSize = keytypesTmp.size();
if (keytypesTmpSize != 0) {
- String keytypes[] =
+ String[] keytypes =
keytypesTmp.toArray(new String[keytypesTmpSize]);
if (conn != null) {
--- a/jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java Thu Jul 09 10:37:07 2015 +0300
@@ -48,7 +48,7 @@
* This value may be empty if it was included in the
* client's certificate ...
*/
- private byte dh_Yc[]; // 1 to 2^16 -1 bytes
+ private byte[] dh_Yc; // 1 to 2^16 -1 bytes
BigInteger getClientPublicKey() {
return dh_Yc == null ? null : new BigInteger(1, dh_Yc);
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java Thu Jul 09 10:37:07 2015 +0300
@@ -146,7 +146,7 @@
byte[] getBytes8() throws IOException {
int len = getInt8();
verifyLength(len);
- byte b[] = new byte[len];
+ byte[] b = new byte[len];
read(b);
return b;
@@ -155,7 +155,7 @@
public byte[] getBytes16() throws IOException {
int len = getInt16();
verifyLength(len);
- byte b[] = new byte[len];
+ byte[] b = new byte[len];
read(b);
return b;
@@ -164,7 +164,7 @@
byte[] getBytes24() throws IOException {
int len = getInt24();
verifyLength(len);
- byte b[] = new byte[len];
+ byte[] b = new byte[len];
read(b);
return b;
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java Thu Jul 09 10:37:07 2015 +0300
@@ -689,8 +689,8 @@
static final
class RSA_ServerKeyExchange extends ServerKeyExchange
{
- private byte rsa_modulus[]; // 1 to 2^16 - 1 bytes
- private byte rsa_exponent[]; // 1 to 2^16 - 1 bytes
+ private byte[] rsa_modulus; // 1 to 2^16 - 1 bytes
+ private byte[] rsa_exponent; // 1 to 2^16 - 1 bytes
private Signature signature;
private byte[] signatureBytes;
@@ -698,7 +698,7 @@
/*
* Hash the nonces and the ephemeral RSA public key.
*/
- private void updateSignature(byte clntNonce[], byte svrNonce[])
+ private void updateSignature(byte[] clntNonce, byte[] svrNonce)
throws SignatureException {
int tmp;
@@ -827,11 +827,11 @@
private final static boolean dhKeyExchangeFix =
Debug.getBooleanProperty("com.sun.net.ssl.dhKeyExchangeFix", true);
- private byte dh_p []; // 1 to 2^16 - 1 bytes
- private byte dh_g []; // 1 to 2^16 - 1 bytes
- private byte dh_Ys []; // 1 to 2^16 - 1 bytes
+ private byte[] dh_p; // 1 to 2^16 - 1 bytes
+ private byte[] dh_g; // 1 to 2^16 - 1 bytes
+ private byte[] dh_Ys; // 1 to 2^16 - 1 bytes
- private byte signature [];
+ private byte[] signature;
// protocol version being established using this ServerKeyExchange message
ProtocolVersion protocolVersion;
@@ -857,8 +857,8 @@
* with the cert chain which was sent ... for DHE_DSS and DHE_RSA
* key exchange. (Constructor called by server.)
*/
- DH_ServerKeyExchange(DHCrypt obj, PrivateKey key, byte clntNonce[],
- byte svrNonce[], SecureRandom sr,
+ DH_ServerKeyExchange(DHCrypt obj, PrivateKey key, byte[] clntNonce,
+ byte[] svrNonce, SecureRandom sr,
SignatureAndHashAlgorithm signAlgorithm,
ProtocolVersion protocolVersion) throws GeneralSecurityException {
@@ -913,7 +913,7 @@
* DHE_DSS or DHE_RSA key exchange. (Called by client.)
*/
DH_ServerKeyExchange(HandshakeInStream input, PublicKey publicKey,
- byte clntNonce[], byte svrNonce[], int messageSize,
+ byte[] clntNonce, byte[] svrNonce, int messageSize,
Collection<SignatureAndHashAlgorithm> localSupportedSignAlgs,
ProtocolVersion protocolVersion)
throws IOException, GeneralSecurityException {
@@ -948,7 +948,7 @@
}
// read the signature
- byte signature[];
+ byte[] signature;
if (dhKeyExchangeFix) {
signature = input.getBytes16();
} else {
@@ -1004,8 +1004,8 @@
/*
* Update sig with nonces and Diffie-Hellman public key.
*/
- private void updateSignature(Signature sig, byte clntNonce[],
- byte svrNonce[]) throws SignatureException {
+ private void updateSignature(Signature sig, byte[] clntNonce,
+ byte[] svrNonce) throws SignatureException {
int tmp;
sig.update(clntNonce);
@@ -1268,8 +1268,8 @@
}
}
- private void updateSignature(Signature sig, byte clntNonce[],
- byte svrNonce[]) throws SignatureException {
+ private void updateSignature(Signature sig, byte[] clntNonce,
+ byte[] svrNonce) throws SignatureException {
sig.update(clntNonce);
sig.update(svrNonce);
@@ -1334,7 +1334,7 @@
* DER encoded distinguished name.
* TLS requires that its not longer than 65535 bytes.
*/
- byte name[];
+ byte[] name;
DistinguishedName(HandshakeInStream input) throws IOException {
name = input.getBytes16();
@@ -1411,8 +1411,8 @@
private final static byte[] TYPES_ECC =
{ cct_rsa_sign, cct_dss_sign, cct_ecdsa_sign };
- byte types []; // 1 to 255 types
- DistinguishedName authorities []; // 3 to 2^16 - 1
+ byte[] types; // 1 to 255 types
+ DistinguishedName[] authorities; // 3 to 2^16 - 1
// ... "3" because that's the smallest DER-encoded X500 DN
// protocol version being established using this CertificateRequest message
@@ -1424,7 +1424,7 @@
// length of supported_signature_algorithms
private int algorithmsLen;
- CertificateRequest(X509Certificate ca[], KeyExchange keyExchange,
+ CertificateRequest(X509Certificate[] ca, KeyExchange keyExchange,
Collection<SignatureAndHashAlgorithm> signAlgs,
ProtocolVersion protocolVersion) throws IOException {
@@ -2063,7 +2063,7 @@
if (protocolVersion.useTLS10PlusSpec()) {
// TLS 1.0+
try {
- byte [] seed;
+ byte[] seed;
String prfAlg;
PRF prf;
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java Thu Jul 09 10:37:07 2015 +0300
@@ -119,7 +119,7 @@
}
}
- public void putBytes16(byte b[]) throws IOException {
+ public void putBytes16(byte[] b) throws IOException {
if (b == null) {
putInt16(0);
} else {
@@ -128,7 +128,7 @@
}
}
- void putBytes24(byte b[]) throws IOException {
+ void putBytes24(byte[] b) throws IOException {
if (b == null) {
putInt24(0);
} else {
--- a/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java Thu Jul 09 10:37:07 2015 +0300
@@ -52,7 +52,7 @@
final static MAC TLS_NULL = new MAC(false);
// Value of the null MAC is fixed
- private static final byte nullMAC[] = new byte[0];
+ private static final byte[] nullMAC = new byte[0];
// internal identifier for the MAC algorithm
private final MacAlg macAlg;
--- a/jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java Thu Jul 09 10:37:07 2015 +0300
@@ -38,7 +38,7 @@
*/
final class RandomCookie {
- byte random_bytes[]; // exactly 32 bytes
+ byte[] random_bytes; // exactly 32 bytes
RandomCookie(SecureRandom generator) {
long temp = System.currentTimeMillis() / 1000;
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java Thu Jul 09 10:37:07 2015 +0300
@@ -986,7 +986,7 @@
ClientKeyExchangeService.find(keyExchange.name) == null) {
CertificateRequest m4;
- X509Certificate caCerts[];
+ X509Certificate[] caCerts;
Collection<SignatureAndHashAlgorithm> localSignAlgs = null;
if (protocolVersion.useTLS12PlusSpec()) {
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SessionId.java Thu Jul 09 10:37:07 2015 +0300
@@ -43,7 +43,7 @@
class SessionId
{
static int MAX_LENGTH = 32;
- private byte sessionId []; // max 32 bytes
+ private byte[] sessionId; // max 32 bytes
/** Constructs a new session ID ... perhaps for a rejoinable session */
SessionId (boolean isRejoinable, SecureRandom generator)
@@ -56,7 +56,7 @@
}
/** Constructs a session ID from a byte array (max size 32 bytes) */
- SessionId (byte sessionId [])
+ SessionId (byte[] sessionId)
{ this.sessionId = sessionId; }
/** Returns the length of the ID, in bytes */
@@ -64,7 +64,7 @@
{ return sessionId.length; }
/** Returns the bytes in the ID. May be an empty array. */
- byte [] getId ()
+ byte[] getId ()
{
return sessionId.clone ();
}
@@ -106,7 +106,7 @@
return false;
SessionId s = (SessionId) obj;
- byte b [] = s.getId ();
+ byte[] b = s.getId ();
if (b.length != sessionId.length)
return false;
--- a/jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -94,13 +94,13 @@
}
@Override
- public void checkClientTrusted(X509Certificate chain[], String authType)
+ public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
checkTrusted(chain, authType, (Socket)null, true);
}
@Override
- public void checkServerTrusted(X509Certificate chain[], String authType)
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
checkTrusted(chain, authType, (Socket)null, false);
}
--- a/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/ManifestDigester.java Thu Jul 09 10:37:07 2015 +0300
@@ -37,7 +37,7 @@
public static final String MF_MAIN_ATTRS = "Manifest-Main-Attributes";
/** the raw bytes of the manifest */
- private byte rawBytes[];
+ private byte[] rawBytes;
/** the offset/length pair for a section */
private HashMap<String, Entry> entries; // key is a UTF-8 string
@@ -107,7 +107,7 @@
return false;
}
- public ManifestDigester(byte bytes[])
+ public ManifestDigester(byte[] bytes)
{
rawBytes = bytes;
entries = new HashMap<>();
@@ -181,7 +181,7 @@
}
}
- private boolean isNameAttr(byte bytes[], int start)
+ private boolean isNameAttr(byte[] bytes, int start)
{
return ((bytes[start] == 'N') || (bytes[start] == 'n')) &&
((bytes[start+1] == 'a') || (bytes[start+1] == 'A')) &&
@@ -261,11 +261,10 @@
return e;
}
- public byte[] manifestDigest(MessageDigest md)
- {
- md.reset();
- md.update(rawBytes, 0, rawBytes.length);
- return md.digest();
- }
+ public byte[] manifestDigest(MessageDigest md) {
+ md.reset();
+ md.update(rawBytes, 0, rawBytes.length);
+ return md.digest();
+ }
}
--- a/jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java Thu Jul 09 10:37:07 2015 +0300
@@ -165,7 +165,7 @@
/**
* update the digests for the digests we are interested in
*/
- public void update(byte buffer[], int off, int len) {
+ public void update(byte[] buffer, int off, int len) {
if (skip) return;
for (int i=0; i < digests.size(); i++) {
--- a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java Thu Jul 09 10:37:07 2015 +0300
@@ -212,7 +212,7 @@
* Constructor, from an array of integers.
* Validity check included.
*/
- public ObjectIdentifier (int values []) throws IOException
+ public ObjectIdentifier(int[] values) throws IOException
{
checkCount(values.length);
checkFirstComponent(values[0]);
--- a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java Thu Jul 09 10:37:07 2015 +0300
@@ -55,7 +55,7 @@
private PKCS7 block;
/** the raw bytes of the .SF file */
- private byte sfBytes[];
+ private byte[] sfBytes;
/** the name of the signature block file, uppercased and without
* the extension (.DSA/.RSA/.EC)
@@ -84,7 +84,7 @@
public SignatureFileVerifier(ArrayList<CodeSigner[]> signerCache,
ManifestDigester md,
String name,
- byte rawBytes[])
+ byte[] rawBytes)
throws IOException, CertificateException
{
// new PKCS7() calls CertificateFactory.getInstance()
@@ -129,7 +129,7 @@
* used to set the raw bytes of the .SF file when it
* is external to the signature block file.
*/
- public void setSignatureFile(byte sfBytes[])
+ public void setSignatureFile(byte[] sfBytes)
{
this.sfBytes = sfBytes;
}
@@ -511,7 +511,7 @@
* CodeSigner objects. We do this only *once* for a given
* signature block file.
*/
- private CodeSigner[] getSigners(SignerInfo infos[], PKCS7 block)
+ private CodeSigner[] getSigners(SignerInfo[] infos, PKCS7 block)
throws IOException, NoSuchAlgorithmException, SignatureException,
CertificateException {
--- a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java Thu Jul 09 10:37:07 2015 +0300
@@ -967,7 +967,7 @@
previousWhite = false;
- byte valueBytes[] = null;
+ byte[] valueBytes = null;
try {
valueBytes = Character.toString(c).getBytes("UTF8");
} catch (IOException ie) {
@@ -1051,7 +1051,7 @@
// using the hex format below. This will be used only
// when the value is not a string type
- byte data [] = value.toByteArray();
+ byte[] data = value.toByteArray();
retval.append('#');
for (int i = 0; i < data.length; i++) {
--- a/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AlgIdDSA.java Thu Jul 09 10:37:07 2015 +0300
@@ -117,7 +117,7 @@
* @param q the DSS/DSA parameter "Q"
* @param g the DSS/DSA parameter "G"
*/
- public AlgIdDSA (byte p [], byte q [], byte g [])
+ public AlgIdDSA (byte[] p, byte[] q, byte[] g)
throws IOException
{
this (new BigInteger (1, p),
--- a/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java Thu Jul 09 10:37:07 2015 +0300
@@ -648,12 +648,12 @@
/*
* COMMON PUBLIC KEY TYPES
*/
- private static final int DH_data[] = { 1, 2, 840, 113549, 1, 3, 1 };
- private static final int DH_PKIX_data[] = { 1, 2, 840, 10046, 2, 1 };
- private static final int DSA_OIW_data[] = { 1, 3, 14, 3, 2, 12 };
- private static final int DSA_PKIX_data[] = { 1, 2, 840, 10040, 4, 1 };
- private static final int RSA_data[] = { 2, 5, 8, 1, 1 };
- private static final int RSAEncryption_data[] =
+ private static final int[] DH_data = { 1, 2, 840, 113549, 1, 3, 1 };
+ private static final int[] DH_PKIX_data = { 1, 2, 840, 10046, 2, 1 };
+ private static final int[] DSA_OIW_data = { 1, 3, 14, 3, 2, 12 };
+ private static final int[] DSA_PKIX_data = { 1, 2, 840, 10040, 4, 1 };
+ private static final int[] RSA_data = { 2, 5, 8, 1, 1 };
+ private static final int[] RSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 1 };
public static final ObjectIdentifier DH_oid;
@@ -674,27 +674,27 @@
/*
* COMMON SIGNATURE ALGORITHMS
*/
- private static final int md2WithRSAEncryption_data[] =
+ private static final int[] md2WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 2 };
- private static final int md5WithRSAEncryption_data[] =
+ private static final int[] md5WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 4 };
- private static final int sha1WithRSAEncryption_data[] =
+ private static final int[] sha1WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 5 };
- private static final int sha1WithRSAEncryption_OIW_data[] =
+ private static final int[] sha1WithRSAEncryption_OIW_data =
{ 1, 3, 14, 3, 2, 29 };
- private static final int sha224WithRSAEncryption_data[] =
+ private static final int[] sha224WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 14 };
- private static final int sha256WithRSAEncryption_data[] =
+ private static final int[] sha256WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 11 };
- private static final int sha384WithRSAEncryption_data[] =
+ private static final int[] sha384WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 12 };
- private static final int sha512WithRSAEncryption_data[] =
+ private static final int[] sha512WithRSAEncryption_data =
{ 1, 2, 840, 113549, 1, 1, 13 };
- private static final int shaWithDSA_OIW_data[] =
+ private static final int[] shaWithDSA_OIW_data =
{ 1, 3, 14, 3, 2, 13 };
- private static final int sha1WithDSA_OIW_data[] =
+ private static final int[] sha1WithDSA_OIW_data =
{ 1, 3, 14, 3, 2, 27 };
- private static final int dsaWithSHA1_PKIX_data[] =
+ private static final int[] dsaWithSHA1_PKIX_data =
{ 1, 2, 840, 10040, 4, 3 };
public static final ObjectIdentifier md2WithRSAEncryption_oid;
--- a/jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/NetscapeCertTypeExtension.java Thu Jul 09 10:37:07 2015 +0300
@@ -69,7 +69,7 @@
public static final String S_MIME_CA = "s_mime_ca";
public static final String OBJECT_SIGNING_CA = "object_signing_ca";
- private static final int CertType_data[] = { 2, 16, 840, 1, 113730, 1, 1 };
+ private static final int[] CertType_data = { 2, 16, 840, 1, 113730, 1, 1 };
/**
* Object identifier for the Netscape-Cert-Type extension.
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java Thu Jul 09 10:37:07 2015 +0300
@@ -102,7 +102,7 @@
private static final String OCSPNOCHECK = ROOT + "." +
OCSPNoCheckExtension.NAME;
- private static final int NetscapeCertType_data[] =
+ private static final int[] NetscapeCertType_data =
{ 2, 16, 840, 1, 113730, 1, 1 };
/** Map ObjectIdentifier(oid) -> OIDInfo(info) */
--- a/jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/PKIXExtensions.java Thu Jul 09 10:37:07 2015 +0300
@@ -49,32 +49,32 @@
*/
public class PKIXExtensions {
// The object identifiers
- private static final int AuthorityKey_data [] = { 2, 5, 29, 35 };
- private static final int SubjectKey_data [] = { 2, 5, 29, 14 };
- private static final int KeyUsage_data [] = { 2, 5, 29, 15 };
- private static final int PrivateKeyUsage_data [] = { 2, 5, 29, 16 };
- private static final int CertificatePolicies_data [] = { 2, 5, 29, 32 };
- private static final int PolicyMappings_data [] = { 2, 5, 29, 33 };
- private static final int SubjectAlternativeName_data [] = { 2, 5, 29, 17 };
- private static final int IssuerAlternativeName_data [] = { 2, 5, 29, 18 };
- private static final int SubjectDirectoryAttributes_data [] = { 2, 5, 29, 9 };
- private static final int BasicConstraints_data [] = { 2, 5, 29, 19 };
- private static final int NameConstraints_data [] = { 2, 5, 29, 30 };
- private static final int PolicyConstraints_data [] = { 2, 5, 29, 36 };
- private static final int CRLDistributionPoints_data [] = { 2, 5, 29, 31 };
- private static final int CRLNumber_data [] = { 2, 5, 29, 20 };
- private static final int IssuingDistributionPoint_data [] = { 2, 5, 29, 28 };
- private static final int DeltaCRLIndicator_data [] = { 2, 5, 29, 27 };
- private static final int ReasonCode_data [] = { 2, 5, 29, 21 };
- private static final int HoldInstructionCode_data [] = { 2, 5, 29, 23 };
- private static final int InvalidityDate_data [] = { 2, 5, 29, 24 };
- private static final int ExtendedKeyUsage_data [] = { 2, 5, 29, 37 };
- private static final int InhibitAnyPolicy_data [] = { 2, 5, 29, 54 };
- private static final int CertificateIssuer_data [] = { 2, 5, 29, 29 };
- private static final int AuthInfoAccess_data [] = { 1, 3, 6, 1, 5, 5, 7, 1, 1};
- private static final int SubjectInfoAccess_data [] = { 1, 3, 6, 1, 5, 5, 7, 1, 11};
- private static final int FreshestCRL_data [] = { 2, 5, 29, 46 };
- private static final int OCSPNoCheck_data [] = { 1, 3, 6, 1, 5, 5, 7,
+ private static final int[] AuthorityKey_data = { 2, 5, 29, 35 };
+ private static final int[] SubjectKey_data = { 2, 5, 29, 14 };
+ private static final int[] KeyUsage_data = { 2, 5, 29, 15 };
+ private static final int[] PrivateKeyUsage_data = { 2, 5, 29, 16 };
+ private static final int[] CertificatePolicies_data = { 2, 5, 29, 32 };
+ private static final int[] PolicyMappings_data = { 2, 5, 29, 33 };
+ private static final int[] SubjectAlternativeName_data = { 2, 5, 29, 17 };
+ private static final int[] IssuerAlternativeName_data = { 2, 5, 29, 18 };
+ private static final int[] SubjectDirectoryAttributes_data = { 2, 5, 29, 9 };
+ private static final int[] BasicConstraints_data = { 2, 5, 29, 19 };
+ private static final int[] NameConstraints_data = { 2, 5, 29, 30 };
+ private static final int[] PolicyConstraints_data = { 2, 5, 29, 36 };
+ private static final int[] CRLDistributionPoints_data = { 2, 5, 29, 31 };
+ private static final int[] CRLNumber_data = { 2, 5, 29, 20 };
+ private static final int[] IssuingDistributionPoint_data = { 2, 5, 29, 28 };
+ private static final int[] DeltaCRLIndicator_data = { 2, 5, 29, 27 };
+ private static final int[] ReasonCode_data = { 2, 5, 29, 21 };
+ private static final int[] HoldInstructionCode_data = { 2, 5, 29, 23 };
+ private static final int[] InvalidityDate_data = { 2, 5, 29, 24 };
+ private static final int[] ExtendedKeyUsage_data = { 2, 5, 29, 37 };
+ private static final int[] InhibitAnyPolicy_data = { 2, 5, 29, 54 };
+ private static final int[] CertificateIssuer_data = { 2, 5, 29, 29 };
+ private static final int[] AuthInfoAccess_data = { 1, 3, 6, 1, 5, 5, 7, 1, 1};
+ private static final int[] SubjectInfoAccess_data = { 1, 3, 6, 1, 5, 5, 7, 1, 11};
+ private static final int[] FreshestCRL_data = { 2, 5, 29, 46 };
+ private static final int[] OCSPNoCheck_data = { 1, 3, 6, 1, 5, 5, 7,
48, 1, 5};
/**
--- a/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X500Name.java Thu Jul 09 10:37:07 2015 +0300
@@ -1119,25 +1119,25 @@
* Includes all those specified in RFC 5280 as MUST or SHOULD
* be recognized
*/
- private static final int commonName_data[] = { 2, 5, 4, 3 };
- private static final int SURNAME_DATA[] = { 2, 5, 4, 4 };
- private static final int SERIALNUMBER_DATA[] = { 2, 5, 4, 5 };
- private static final int countryName_data[] = { 2, 5, 4, 6 };
- private static final int localityName_data[] = { 2, 5, 4, 7 };
- private static final int stateName_data[] = { 2, 5, 4, 8 };
- private static final int streetAddress_data[] = { 2, 5, 4, 9 };
- private static final int orgName_data[] = { 2, 5, 4, 10 };
- private static final int orgUnitName_data[] = { 2, 5, 4, 11 };
- private static final int title_data[] = { 2, 5, 4, 12 };
- private static final int GIVENNAME_DATA[] = { 2, 5, 4, 42 };
- private static final int INITIALS_DATA[] = { 2, 5, 4, 43 };
- private static final int GENERATIONQUALIFIER_DATA[] = { 2, 5, 4, 44 };
- private static final int DNQUALIFIER_DATA[] = { 2, 5, 4, 46 };
+ private static final int[] commonName_data = { 2, 5, 4, 3 };
+ private static final int[] SURNAME_DATA = { 2, 5, 4, 4 };
+ private static final int[] SERIALNUMBER_DATA = { 2, 5, 4, 5 };
+ private static final int[] countryName_data = { 2, 5, 4, 6 };
+ private static final int[] localityName_data = { 2, 5, 4, 7 };
+ private static final int[] stateName_data = { 2, 5, 4, 8 };
+ private static final int[] streetAddress_data = { 2, 5, 4, 9 };
+ private static final int[] orgName_data = { 2, 5, 4, 10 };
+ private static final int[] orgUnitName_data = { 2, 5, 4, 11 };
+ private static final int[] title_data = { 2, 5, 4, 12 };
+ private static final int[] GIVENNAME_DATA = { 2, 5, 4, 42 };
+ private static final int[] INITIALS_DATA = { 2, 5, 4, 43 };
+ private static final int[] GENERATIONQUALIFIER_DATA = { 2, 5, 4, 44 };
+ private static final int[] DNQUALIFIER_DATA = { 2, 5, 4, 46 };
- private static final int ipAddress_data[] = { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 };
- private static final int DOMAIN_COMPONENT_DATA[] =
+ private static final int[] ipAddress_data = { 1, 3, 6, 1, 4, 1, 42, 2, 11, 2, 1 };
+ private static final int[] DOMAIN_COMPONENT_DATA =
{ 0, 9, 2342, 19200300, 100, 1, 25 };
- private static final int userid_data[] =
+ private static final int[] userid_data =
{ 0, 9, 2342, 19200300, 100, 1, 1 };
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -1086,7 +1086,7 @@
throw new CRLException("Invalid DER-encoded CRL data");
signedCRL = val.toByteArray();
- DerValue seq[] = new DerValue[3];
+ DerValue[] seq = new DerValue[3];
seq[0] = val.data.getDerValue();
seq[1] = val.data.getDerValue();
--- a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java Thu Jul 09 10:37:07 2015 +0300
@@ -427,7 +427,7 @@
/*
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
ServicePermission this_ =
new ServicePermission(args[0], "accept");
ServicePermission that_ =
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -75,7 +75,7 @@
}
GSSCredentialImpl(GSSManagerImpl gssManager, GSSName name,
- int lifetime, Oid mechs[], int usage)
+ int lifetime, Oid[] mechs, int usage)
throws GSSException {
init(gssManager);
boolean defaultList = false;
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -128,7 +128,7 @@
return new GSSNameImpl(this, nameStr, nameType);
}
- public GSSName createName(byte name[], Oid nameType)
+ public GSSName createName(byte[] name, Oid nameType)
throws GSSException {
return new GSSNameImpl(this, name, nameType);
}
@@ -138,7 +138,7 @@
return new GSSNameImpl(this, nameStr, nameType, mech);
}
- public GSSName createName(byte name[], Oid nameType, Oid mech)
+ public GSSName createName(byte[] name, Oid nameType, Oid mech)
throws GSSException {
return new GSSNameImpl(this, name, nameType, mech);
}
@@ -155,7 +155,7 @@
}
public GSSCredential createCredential(GSSName aName,
- int lifetime, Oid mechs[], int usage)
+ int lifetime, Oid[] mechs, int usage)
throws GSSException {
return wrap(new GSSCredentialImpl(this, aName, lifetime, mechs, usage));
}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java Thu Jul 09 10:37:07 2015 +0300
@@ -159,7 +159,7 @@
/**
* Constructor for Krb5Context to import a previously exported context.
*/
- public Krb5Context(GSSCaller caller, byte [] interProcessToken)
+ public Krb5Context(GSSCaller caller, byte[] interProcessToken)
throws GSSException {
throw new GSSException(GSSException.UNAVAILABLE,
-1, "GSS Import Context not available");
@@ -905,7 +905,7 @@
* and verifyMIC care about the remote sequence number (peerSeqNumber).
*/
- public final byte[] wrap(byte inBuf[], int offset, int len,
+ public final byte[] wrap(byte[] inBuf, int offset, int len,
MessageProp msgProp) throws GSSException {
if (DEBUG) {
System.out.println("Krb5Context.wrap: data=["
@@ -943,7 +943,7 @@
}
}
- public final int wrap(byte inBuf[], int inOffset, int len,
+ public final int wrap(byte[] inBuf, int inOffset, int len,
byte[] outBuf, int outOffset,
MessageProp msgProp) throws GSSException {
@@ -977,7 +977,7 @@
}
}
- public final void wrap(byte inBuf[], int offset, int len,
+ public final void wrap(byte[] inBuf, int offset, int len,
OutputStream os, MessageProp msgProp)
throws GSSException {
@@ -1032,7 +1032,7 @@
wrap(data, 0, data.length, os, msgProp);
}
- public final byte[] unwrap(byte inBuf[], int offset, int len,
+ public final byte[] unwrap(byte[] inBuf, int offset, int len,
MessageProp msgProp)
throws GSSException {
@@ -1069,7 +1069,7 @@
return data;
}
- public final int unwrap(byte inBuf[], int inOffset, int len,
+ public final int unwrap(byte[] inBuf, int inOffset, int len,
byte[] outBuf, int outOffset,
MessageProp msgProp) throws GSSException {
@@ -1141,7 +1141,7 @@
}
}
- public final byte[] getMIC(byte []inMsg, int offset, int len,
+ public final byte[] getMIC(byte[] inMsg, int offset, int len,
MessageProp msgProp)
throws GSSException {
@@ -1166,7 +1166,7 @@
}
}
- private int getMIC(byte []inMsg, int offset, int len,
+ private int getMIC(byte[] inMsg, int offset, int len,
byte[] outBuf, int outOffset,
MessageProp msgProp)
throws GSSException {
@@ -1236,7 +1236,7 @@
getMIC(data, 0, data.length, os, msgProp);
}
- public final void verifyMIC(byte []inTok, int tokOffset, int tokLen,
+ public final void verifyMIC(byte[] inTok, int tokOffset, int tokLen,
byte[] inMsg, int msgOffset, int msgLen,
MessageProp msgProp)
throws GSSException {
@@ -1293,7 +1293,7 @@
* @param os the output token will be written to this stream
* @exception GSSException
*/
- public final byte [] export() throws GSSException {
+ public final byte[] export() throws GSSException {
throw new GSSException(GSSException.UNAVAILABLE, -1,
"GSS Export Context not available");
}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java Thu Jul 09 10:37:07 2015 +0300
@@ -265,7 +265,7 @@
/**
* For apps that want simplicity and don't care about buffer copies.
*/
- public byte[] wrap(byte inBuf[], int offset, int len,
+ public byte[] wrap(byte[] inBuf, int offset, int len,
MessageProp msgProp) throws GSSException;
/**
@@ -275,7 +275,7 @@
*
* NOTE: This method is not defined in public class org.ietf.jgss.GSSContext
*
- public int wrap(byte inBuf[], int inOffset, int len,
+ public int wrap(byte[] inBuf, int inOffset, int len,
byte[] outBuf, int outOffset,
MessageProp msgProp) throws GSSException;
@@ -292,7 +292,7 @@
*
* NOTE: This method is not defined in public class org.ietf.jgss.GSSContext
*
- public void wrap(byte inBuf[], int offset, int len,
+ public void wrap(byte[] inBuf, int offset, int len,
OutputStream os, MessageProp msgProp)
throws GSSException;
*/
@@ -314,7 +314,7 @@
/**
* For apps that want simplicity and don't care about buffer copies.
*/
- public byte[] unwrap(byte inBuf[], int offset, int len,
+ public byte[] unwrap(byte[] inBuf, int offset, int len,
MessageProp msgProp) throws GSSException;
/**
@@ -324,7 +324,7 @@
*
* NOTE: This method is not defined in public class org.ietf.jgss.GSSContext
*
- public int unwrap(byte inBuf[], int inOffset, int len,
+ public int unwrap(byte[] inBuf, int inOffset, int len,
byte[] outBuf, int outOffset,
MessageProp msgProp) throws GSSException;
@@ -356,7 +356,7 @@
MessageProp msgProp)
throws GSSException;
- public byte[] getMIC(byte []inMsg, int offset, int len,
+ public byte[] getMIC(byte[] inMsg, int offset, int len,
MessageProp msgProp) throws GSSException;
/**
@@ -372,7 +372,7 @@
public void verifyMIC(InputStream is, InputStream msgStr,
MessageProp mProp) throws GSSException;
- public void verifyMIC(byte []inTok, int tokOffset, int tokLen,
+ public void verifyMIC(byte[] inTok, int tokOffset, int tokLen,
byte[] inMsg, int msgOffset, int msgLen,
MessageProp msgProp) throws GSSException;
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java Thu Jul 09 10:37:07 2015 +0300
@@ -372,7 +372,7 @@
}
return cStub.wrap(pContext, data, msgProp);
}
- public void wrap(byte inBuf[], int offset, int len,
+ public void wrap(byte[] inBuf, int offset, int len,
OutputStream os, MessageProp msgProp)
throws GSSException {
try {
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Thu Jul 09 10:37:07 2015 +0300
@@ -78,7 +78,7 @@
if (DEBUG) err.printStackTrace();
return null;
}
- String gssLibs[] = new String[0];
+ String[] gssLibs = new String[0];
String defaultLib = System.getProperty(LIB_PROP);
if (defaultLib == null || defaultLib.trim().equals("")) {
String osname = System.getProperty("os.name");
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java Thu Jul 09 10:37:07 2015 +0300
@@ -568,7 +568,7 @@
temp.putInteger(bint);
bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), temp);
temp = new DerOutputStream();
- DerValue der[] = new DerValue[nameStrings.length];
+ DerValue[] der = new DerValue[nameStrings.length];
for (int i = 0; i < nameStrings.length; i++) {
der[i] = new KerberosString(nameStrings[i]).toDerValue();
}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java Thu Jul 09 10:37:07 2015 +0300
@@ -198,7 +198,7 @@
if (authorizationData != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x08), authorizationData.asn1Encode()));
}
- DerValue der[] = new DerValue[v.size()];
+ DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
temp = new DerOutputStream();
temp.putSequence(der);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java Thu Jul 09 10:37:07 2015 +0300
@@ -120,7 +120,7 @@
*/
public byte[] asn1Encode() throws Asn1Exception, IOException {
DerOutputStream bytes = new DerOutputStream();
- DerValue der[] = new DerValue[entry.length];
+ DerValue[] der = new DerValue[entry.length];
for (int i = 0; i < entry.length; i++) {
der[i] = new DerValue(entry[i].asn1Encode());
}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java Thu Jul 09 10:37:07 2015 +0300
@@ -151,7 +151,7 @@
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x03), temp.toByteArray()));
}
- DerValue der[] = new DerValue[v.size()];
+ DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
temp = new DerOutputStream();
temp.putSequence(der);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Thu Jul 09 10:37:07 2015 +0300
@@ -129,7 +129,7 @@
subDer = der.getData().getDerValue();
if ((subDer.getTag() & (byte) 0x1F) == (byte) 0x00) {
- DerValue derValues[] = subDer.getData().getSequence(1);
+ DerValue[] derValues = subDer.getData().getSequence(1);
ticketInfo = new KrbCredInfo[derValues.length];
for (int i = 0; i < derValues.length; i++) {
ticketInfo[i] = new KrbCredInfo(derValues[i]);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java Thu Jul 09 10:37:07 2015 +0300
@@ -98,8 +98,8 @@
throw new KrbException(Krb5.KRB_ERR_GENERIC, "Bad name");
String host = components[1];
- InetAddress addr[] = InetAddress.getAllByName(host);
- HostAddress hAddrs[] = new HostAddress[addr.length];
+ InetAddress[] addr = InetAddress.getAllByName(host);
+ HostAddress[] hAddrs = new HostAddress[addr.length];
for (int i = 0; i < addr.length; i++) {
hAddrs[i] = new HostAddress(addr[i]);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java Thu Jul 09 10:37:07 2015 +0300
@@ -269,7 +269,7 @@
ticketsTemp.write(DerValue.tag_SequenceOf, temp);
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0B), ticketsTemp.toByteArray()));
}
- DerValue der[] = new DerValue[v.size()];
+ DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
temp = new DerOutputStream();
temp.putSequence(der);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/KrbCredInfo.java Thu Jul 09 10:37:07 2015 +0300
@@ -172,7 +172,7 @@
}
if (caddr != null)
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0A), caddr.asn1Encode()));
- DerValue der[] = new DerValue[v.size()];
+ DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
DerOutputStream out = new DerOutputStream();
out.putSequence(der);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/NetClient.java Thu Jul 09 10:37:07 2015 +0300
@@ -200,7 +200,7 @@
@Override
public byte[] receive() throws IOException {
- byte ibuf[] = new byte[bufSize];
+ byte[] ibuf = new byte[bufSize];
dgPacketIn = new DatagramPacket(ibuf, ibuf.length);
try {
dgSocket.receive(dgPacketIn);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/Ticket.java Thu Jul 09 10:37:07 2015 +0300
@@ -135,7 +135,7 @@
public byte[] asn1Encode() throws Asn1Exception, IOException {
DerOutputStream bytes = new DerOutputStream();
DerOutputStream temp = new DerOutputStream();
- DerValue der[] = new DerValue[4];
+ DerValue[] der = new DerValue[4];
temp.putInteger(BigInteger.valueOf(tkt_vno));
bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), temp);
bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), sname.getRealm().asn1Encode());
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Thu Jul 09 10:37:07 2015 +0300
@@ -357,7 +357,7 @@
if (DEBUG) {
System.out.println(">>>DEBUG <CCacheInputStream> key type: " + key.getEType());
}
- long times[] = readTimes();
+ long[] times = readTimes();
KerberosTime authtime = new KerberosTime(times[0]);
KerberosTime starttime =
(times[1]==0) ? null : new KerberosTime(times[1]);
@@ -374,9 +374,9 @@
((renewTill==null)?"null":renewTill.toDate().toString()));
}
boolean skey = readskey();
- boolean flags[] = readFlags();
+ boolean[] flags = readFlags();
TicketFlags tFlags = new TicketFlags(flags);
- HostAddress addr[] = readAddr();
+ HostAddress[] addr = readAddr();
HostAddresses addrs = null;
if (addr != null) {
addrs = new HostAddresses(addr);
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/crc32.java Thu Jul 09 10:37:07 2015 +0300
@@ -112,7 +112,7 @@
* This version is more efficient than the byte-at-a-time version;
* it avoids data copies and reduces per-byte call overhead.
*/
- protected synchronized void engineUpdate(byte input[], int offset,
+ protected synchronized void engineUpdate(byte[] input, int offset,
int len) {
processData(input, offset, len);
}
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java Thu Jul 09 10:37:07 2015 +0300
@@ -53,8 +53,8 @@
final class KerberosPreMasterSecret {
private ProtocolVersion protocolVersion; // preMaster [0,1]
- private byte preMaster[]; // 48 bytes
- private byte encrypted[];
+ private byte[] preMaster; // 48 bytes
+ private byte[] encrypted;
/**
* Constructor used by client to generate premaster secret.
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ClientFactoryImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -47,13 +47,13 @@
* @author Rosanna Lee
*/
final public class ClientFactoryImpl implements SaslClientFactory {
- private static final String myMechs[] = {
+ private static final String[] myMechs = {
"EXTERNAL",
"CRAM-MD5",
"PLAIN",
};
- private static final int mechPolicies[] = {
+ private static final int[] mechPolicies = {
// %%% RL: Policies should actually depend on the external channel
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOACTIVE|PolicyUtils.NODICTIONARY,
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOANONYMOUS, // CRAM-MD5
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/CramMD5Server.java Thu Jul 09 10:37:07 2015 +0300
@@ -165,7 +165,7 @@
PasswordCallback pcb =
new PasswordCallback("CRAM-MD5 password: ", false);
cbh.handle(new Callback[]{ncb,pcb});
- char pwChars[] = pcb.getPassword();
+ char[] pwChars = pcb.getPassword();
if (pwChars == null || pwChars.length == 0) {
// user has no password; OK to disclose to server
aborted = true;
@@ -190,7 +190,7 @@
clearPassword();
// Check whether digest is as expected
- byte [] expectedDigest = digest.getBytes("UTF8");
+ byte[] expectedDigest = digest.getBytes("UTF8");
int digestLen = responseData.length - ulen - 1;
if (expectedDigest.length != digestLen) {
aborted = true;
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ServerFactoryImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -41,11 +41,11 @@
* @author Rosanna Lee
*/
final public class ServerFactoryImpl implements SaslServerFactory {
- private static final String myMechs[] = {
+ private static final String[] myMechs = {
"CRAM-MD5", //
};
- private static final int mechPolicies[] = {
+ private static final int[] mechPolicies = {
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOANONYMOUS, // CRAM-MD5
};
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Thu Jul 09 10:37:07 2015 +0300
@@ -272,7 +272,7 @@
*/
/** This array maps the characters to their 6 bit values */
- private final static char pem_array[] = {
+ private final static char[] pem_array = {
// 0 1 2 3 4 5 6 7
'A','B','C','D','E','F','G','H', // 0
'I','J','K','L','M','N','O','P', // 1
@@ -1068,7 +1068,7 @@
byte[] hMAC_MD5 = m.doFinal();
/* First 10 bytes of HMAC_MD5 digest */
- byte macBuffer[] = new byte[10];
+ byte[] macBuffer = new byte[10];
System.arraycopy(hMAC_MD5, 0, macBuffer, 0, 10);
return macBuffer;
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/FactoryImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -44,9 +44,9 @@
public final class FactoryImpl implements SaslClientFactory,
SaslServerFactory{
- private static final String myMechs[] = { "DIGEST-MD5" };
+ private static final String[] myMechs = { "DIGEST-MD5" };
private static final int DIGEST_MD5 = 0;
- private static final int mechPolicies[] = {
+ private static final int[] mechPolicies = {
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOANONYMOUS};
/**
--- a/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -43,8 +43,8 @@
public final class FactoryImpl implements SaslClientFactory,
SaslServerFactory{
- private static final String myMechs[] = { "NTLM" };
- private static final int mechPolicies[] = {
+ private static final String[] myMechs = { "NTLM" };
+ private static final int[] mechPolicies = {
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOANONYMOUS
};
--- a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java Thu Jul 09 10:37:07 2015 +0300
@@ -66,7 +66,7 @@
class KeyEntry
{
private Key privateKey;
- private X509Certificate certChain[];
+ private X509Certificate[] certChain;
private String alias;
KeyEntry(Key key, X509Certificate[] chain) {
--- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java Thu Jul 09 10:37:07 2015 +0300
@@ -175,7 +175,7 @@
this.algorithm = algorithm;
this.mechanism = mechanism;
- String algoParts[] = algorithm.split("/");
+ String[] algoParts = algorithm.split("/");
if (algoParts[0].startsWith("AES")) {
blockSize = 16;
--- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java Thu Jul 09 10:37:07 2015 +0300
@@ -164,7 +164,7 @@
private X509Certificate cert = null;
// chain
- private X509Certificate chain[] = null;
+ private X509Certificate[] chain = null;
// true if CKA_ID for private key and cert match up
private boolean matched = false;
--- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java Thu Jul 09 10:37:07 2015 +0300
@@ -42,7 +42,7 @@
public class CK_AES_CTR_PARAMS {
private final long ulCounterBits;
- private final byte cb[];
+ private final byte[] cb;
public CK_AES_CTR_PARAMS(byte[] cb) {
ulCounterBits = 128;
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java Thu Jul 09 10:37:07 2015 +0300
@@ -40,7 +40,7 @@
private static final long serialVersionUID = -933864511110035746L;
// NOTE: check /usr/include/sys/crypto/common.h for updates
- private static final String ERROR_MSG[] = {
+ private static final String[] ERROR_MSG = {
"CRYPTO_SUCCESS",
"CRYPTO_CANCEL",
"CRYPTO_HOST_MEMORY",
--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Crypt.java Thu Jul 09 10:37:07 2015 +0300
@@ -377,7 +377,7 @@
*
*/
- public static void main(String arg[]) {
+ public static void main(String[] arg) {
if (arg.length!=2) {
System.err.println("usage: Crypt password salt");
@@ -386,7 +386,7 @@
Crypt c = new Crypt();
try {
- byte result[] = c.crypt
+ byte[] result = c.crypt
(arg[0].getBytes("ISO-8859-1"), arg[1].getBytes("ISO-8859-1"));
for (int i=0; i<result.length; i++) {
System.out.println(" "+i+" "+(char)result[i]);
--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java Thu Jul 09 10:37:07 2015 +0300
@@ -729,8 +729,8 @@
Crypt c = new Crypt();
try {
- byte oldCrypt[] = encryptedPassword.getBytes("UTF8");
- byte newCrypt[] = c.crypt(password.getBytes("UTF8"),
+ byte[] oldCrypt = encryptedPassword.getBytes("UTF8");
+ byte[] newCrypt = c.crypt(password.getBytes("UTF8"),
oldCrypt);
if (newCrypt.length != oldCrypt.length)
return false;
--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java Thu Jul 09 10:37:07 2015 +0300
@@ -81,7 +81,7 @@
private NTDomainPrincipal userDomain; // user domain
private NTSidDomainPrincipal domainSID; // domain SID
private NTSidPrimaryGroupPrincipal primaryGroup; // primary group
- private NTSidGroupPrincipal groups[]; // supplementary groups
+ private NTSidGroupPrincipal[] groups; // supplementary groups
private NTNumericCredential iToken; // impersonation token
/**
@@ -194,7 +194,7 @@
if (ntSystem.getGroupIDs() != null &&
ntSystem.getGroupIDs().length > 0) {
- String groupSIDs[] = ntSystem.getGroupIDs();
+ String[] groupSIDs = ntSystem.getGroupIDs();
groups = new NTSidGroupPrincipal[groupSIDs.length];
for (int i = 0; i < groupSIDs.length; i++) {
groups[i] = new NTSidGroupPrincipal(groupSIDs[i]);
--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java Thu Jul 09 10:37:07 2015 +0300
@@ -40,7 +40,7 @@
private String domain;
private String domainSID;
private String userSID;
- private String groupIDs[];
+ private String[] groupIDs;
private String primaryGroupID;
private long impersonationToken;
--- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java Wed Jul 08 21:54:32 2015 -0400
+++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java Thu Jul 09 10:37:07 2015 +0300
@@ -38,10 +38,10 @@
* @author Rosanna Lee
*/
public final class FactoryImpl implements SaslClientFactory, SaslServerFactory {
- private static final String myMechs[] = {
+ private static final String[] myMechs = {
"GSSAPI"};
- private static final int mechPolicies[] = {
+ private static final int[] mechPolicies = {
PolicyUtils.NOPLAINTEXT|PolicyUtils.NOANONYMOUS|PolicyUtils.NOACTIVE
};