Skip to content

Commit

Permalink
8273299: Unnecessary Vector usage in java.security.jgss
Browse files Browse the repository at this point in the history 
Reviewed-by: weijun
  • Loading branch information
@turbanoff @wangweij
turbanoff authored and wangweij committed Oct 26, 2021
1 parent b98ed55 commit c9dec2f
Show file tree
Hide file tree
Showing 12 changed files with 91 additions and 104 deletions.
6 changes: 3 additions & 3 deletions src/java.security.jgss/share/classes/sun/security/jgss/GSSCredentialImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
Expand Down Expand Up @@ -405,12 +405,12 @@ public Oid[] getMechs() throws GSSException {
throw new IllegalStateException("This credential is " +
"no longer valid");
}
Vector<Oid> result = new Vector<Oid>(hashtable.size());
ArrayList<Oid> result = new ArrayList<Oid>(hashtable.size());

for (Enumeration<SearchKey> e = hashtable.keys();
e.hasMoreElements(); ) {
SearchKey tempKey = e.nextElement();
result.addElement(tempKey.getMech());
result.add(tempKey.getMech());
}
return result.toArray(new Oid[0]);
}
Expand Down
20 changes: 9 additions & 11 deletions src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import sun.security.krb5.internal.*;
import sun.security.util.*;
import java.net.*;
import java.util.Vector;
import java.util.ArrayList;
import java.util.Locale;
import java.io.IOException;
import java.math.BigInteger;
Expand Down Expand Up @@ -270,15 +270,14 @@ public PrincipalName(DerValue encoding, Realm realm)
if (subDer.getTag() != DerValue.tag_SequenceOf) {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
Vector<String> v = new Vector<>();
ArrayList<String> v = new ArrayList<>();
DerValue subSubDer;
while(subDer.getData().available() > 0) {
subSubDer = subDer.getData().getDerValue();
String namePart = new KerberosString(subSubDer).toString();
v.addElement(namePart);
v.add(namePart);
}
nameStrings = new String[v.size()];
v.copyInto(nameStrings);
nameStrings = v.toArray(new String[0]);
validateNameStrings(nameStrings);
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
Expand Down Expand Up @@ -326,7 +325,7 @@ public static PrincipalName parse(DerInputStream data,
// Code repetition, realm parsed again by class Realm
private static String[] parseName(String name) {

Vector<String> tempStrings = new Vector<>();
ArrayList<String> tempStrings = new ArrayList<>();
String temp = name;
int i = 0;
int componentStart = 0;
Expand All @@ -346,7 +345,7 @@ private static String[] parseName(String name) {
else {
if (componentStart <= i) {
component = temp.substring(componentStart, i);
tempStrings.addElement(component);
tempStrings.add(component);
}
componentStart = i + 1;
}
Expand All @@ -363,7 +362,7 @@ private static String[] parseName(String name) {
} else {
if (componentStart < i) {
component = temp.substring(componentStart, i);
tempStrings.addElement(component);
tempStrings.add(component);
}
componentStart = i + 1;
break;
Expand All @@ -375,11 +374,10 @@ private static String[] parseName(String name) {

if (i == temp.length()) {
component = temp.substring(componentStart, i);
tempStrings.addElement(component);
tempStrings.add(component);
}

String[] result = new String[tempStrings.size()];
tempStrings.copyInto(result);
String[] result = tempStrings.toArray(new String[0]);
return result;
}

Expand Down
25 changes: 12 additions & 13 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/Authenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import sun.security.krb5.*;
import sun.security.util.*;
import java.util.Vector;
import java.util.ArrayList;
import java.io.IOException;
import java.math.BigInteger;

Expand Down Expand Up @@ -173,33 +173,32 @@ private void init(DerValue encoding)
* @exception IOException if an I/O error occurs while reading encoded data.
*/
public byte[] asn1Encode() throws Asn1Exception, IOException {
Vector<DerValue> v = new Vector<>();
ArrayList<DerValue> v = new ArrayList<>();
DerOutputStream temp = new DerOutputStream();
temp.putInteger(BigInteger.valueOf(authenticator_vno));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x01), cname.getRealm().asn1Encode()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x02), cname.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x01), cname.getRealm().asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x02), cname.asn1Encode()));
if (cksum != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x03), cksum.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x03), cksum.asn1Encode()));
}
temp = new DerOutputStream();
temp.putInteger(BigInteger.valueOf(cusec));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x04), temp.toByteArray()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x05), ctime.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x04), temp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x05), ctime.asn1Encode()));
if (subKey != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x06), subKey.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x06), subKey.asn1Encode()));
}
if (seqNumber != null) {
temp = new DerOutputStream();
// encode as an unsigned integer (UInt32)
temp.putInteger(BigInteger.valueOf(seqNumber.longValue()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x07), temp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x07), temp.toByteArray()));
}
if (authorizationData != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x08), authorizationData.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x08), authorizationData.asn1Encode()));
}
DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
DerValue[] der = v.toArray(new DerValue[0]);
temp = new DerOutputStream();
temp.putSequence(der);
DerOutputStream out = new DerOutputStream();
Expand Down
9 changes: 4 additions & 5 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/AuthorizationData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import sun.security.util.*;
import sun.security.krb5.Asn1Exception;
import java.util.Vector;
import java.util.ArrayList;
import java.io.IOException;
import sun.security.krb5.internal.ccache.CCacheOutputStream;

Expand Down Expand Up @@ -99,16 +99,15 @@ public Object clone() {
* @exception IOException if an I/O error occurs while reading encoded data.
*/
public AuthorizationData(DerValue der) throws Asn1Exception, IOException {
Vector<AuthorizationDataEntry> v = new Vector<>();
ArrayList<AuthorizationDataEntry> v = new ArrayList<>();
if (der.getTag() != DerValue.tag_Sequence) {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
while (der.getData().available() > 0) {
v.addElement(new AuthorizationDataEntry(der.getData().getDerValue()));
v.add(new AuthorizationDataEntry(der.getData().getDerValue()));
}
if (v.size() > 0) {
entry = new AuthorizationDataEntry[v.size()];
v.copyInto(entry);
entry = v.toArray(new AuthorizationDataEntry[0]);
}
}

Expand Down
15 changes: 7 additions & 8 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/EncAPRepPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import sun.security.krb5.*;
import sun.security.util.*;
import java.util.Vector;
import java.util.ArrayList;
import java.io.IOException;
import java.math.BigInteger;

Expand Down Expand Up @@ -133,26 +133,25 @@ private void init(DerValue encoding) throws Asn1Exception, IOException {
* @exception IOException if an I/O error occurs while reading encoded data.
*/
public byte[] asn1Encode() throws Asn1Exception, IOException {
Vector<DerValue> v = new Vector<>();
ArrayList<DerValue> v = new ArrayList<>();
DerOutputStream temp = new DerOutputStream();
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x00), ctime.asn1Encode()));
temp.putInteger(BigInteger.valueOf(cusec));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x01), temp.toByteArray()));
if (subKey != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x02), subKey.asn1Encode()));
}
if (seqNumber != null) {
temp = new DerOutputStream();
// encode as an unsigned integer (UInt32)
temp.putInteger(BigInteger.valueOf(seqNumber.longValue()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x03), temp.toByteArray()));
}
DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
DerValue[] der = v.toArray(new DerValue[0]);
temp = new DerOutputStream();
temp.putSequence(der);
DerOutputStream out = new DerOutputStream();
Expand Down
9 changes: 4 additions & 5 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddresses.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
Expand Down Expand Up @@ -178,15 +178,14 @@ public boolean equals(Object obj) {
*/
public HostAddresses(DerValue encoding)
throws Asn1Exception, IOException {
Vector<HostAddress> tempAddresses = new Vector<>();
ArrayList<HostAddress> tempAddresses = new ArrayList<>();
DerValue der = null;
while (encoding.getData().available() > 0) {
der = encoding.getData().getDerValue();
tempAddresses.addElement(new HostAddress(der));
tempAddresses.add(new HostAddress(der));
}
if (tempAddresses.size() > 0) {
addresses = new HostAddress[tempAddresses.size()];
tempAddresses.copyInto(addresses);
addresses = tempAddresses.toArray(new HostAddress[0]);
}
}

Expand Down
46 changes: 22 additions & 24 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReqBody.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import sun.security.krb5.*;
import sun.security.util.*;
import java.util.Vector;
import java.util.ArrayList;
import java.io.IOException;
import java.math.BigInteger;

Expand Down Expand Up @@ -165,17 +165,17 @@ public KDCReqBody(DerValue encoding, int msgType)
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
der = encoding.getData().getDerValue();
Vector<Integer> v = new Vector<>();
if ((der.getTag() & (byte)0x1F) == (byte)0x08) {
subDer = der.getData().getDerValue();

if (subDer.getTag() == DerValue.tag_SequenceOf) {
ArrayList<Integer> v = new ArrayList<>();
while(subDer.getData().available() > 0) {
v.addElement(subDer.getData().getBigInteger().intValue());
v.add(subDer.getData().getBigInteger().intValue());
}
eType = new int[v.size()];
for (int i = 0; i < v.size(); i++) {
eType[i] = v.elementAt(i);
eType[i] = v.get(i);
}
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
Expand All @@ -190,20 +190,19 @@ public KDCReqBody(DerValue encoding, int msgType)
encAuthorizationData = EncryptedData.parse(encoding.getData(), (byte)0x0A, true);
}
if (encoding.getData().available() > 0) {
Vector<Ticket> tempTickets = new Vector<>();
der = encoding.getData().getDerValue();
if ((der.getTag() & (byte)0x1F) == (byte)0x0B) {
ArrayList<Ticket> tempTickets = new ArrayList<>();
subDer = der.getData().getDerValue();
if (subDer.getTag() == DerValue.tag_SequenceOf) {
while (subDer.getData().available() > 0) {
tempTickets.addElement(new Ticket(subDer.getData().getDerValue()));
tempTickets.add(new Ticket(subDer.getData().getDerValue()));
}
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
if (tempTickets.size() > 0) {
additionalTickets = new Ticket[tempTickets.size()];
tempTickets.copyInto(additionalTickets);
additionalTickets = tempTickets.toArray(new Ticket[0]);
}
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
Expand All @@ -223,42 +222,42 @@ public KDCReqBody(DerValue encoding, int msgType)
*
*/
public byte[] asn1Encode(int msgType) throws Asn1Exception, IOException {
Vector<DerValue> v = new Vector<>();
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), kdcOptions.asn1Encode()));
ArrayList<DerValue> v = new ArrayList<>();
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), kdcOptions.asn1Encode()));
if (msgType == Krb5.KRB_AS_REQ) {
if (cname != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), cname.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), cname.asn1Encode()));
}
}
if (sname != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x02), sname.getRealm().asn1Encode()));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x03), sname.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x02), sname.getRealm().asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x03), sname.asn1Encode()));
} else if (cname != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x02), cname.getRealm().asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x02), cname.getRealm().asn1Encode()));
}
if (from != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x04), from.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x04), from.asn1Encode()));
}
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x05), till.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x05), till.asn1Encode()));
if (rtime != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x06), rtime.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x06), rtime.asn1Encode()));
}
DerOutputStream temp = new DerOutputStream();
temp.putInteger(BigInteger.valueOf(nonce));
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x07), temp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x07), temp.toByteArray()));
//revisit, if empty eType sequences are allowed
temp = new DerOutputStream();
for (int i = 0; i < eType.length; i++) {
temp.putInteger(BigInteger.valueOf(eType[i]));
}
DerOutputStream eTypetemp = new DerOutputStream();
eTypetemp.write(DerValue.tag_SequenceOf, temp);
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x08), eTypetemp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x08), eTypetemp.toByteArray()));
if (addresses != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x09), addresses.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x09), addresses.asn1Encode()));
}
if (encAuthorizationData != null) {
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0A), encAuthorizationData.asn1Encode()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0A), encAuthorizationData.asn1Encode()));
}
if (additionalTickets != null && additionalTickets.length > 0) {
temp = new DerOutputStream();
Expand All @@ -267,10 +266,9 @@ public byte[] asn1Encode(int msgType) throws Asn1Exception, IOException {
}
DerOutputStream ticketsTemp = new DerOutputStream();
ticketsTemp.write(DerValue.tag_SequenceOf, temp);
v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0B), ticketsTemp.toByteArray()));
v.add(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x0B), ticketsTemp.toByteArray()));
}
DerValue[] der = new DerValue[v.size()];
v.copyInto(der);
DerValue[] der = v.toArray(new DerValue[0]);
temp = new DerOutputStream();
temp.putSequence(der);
return temp.toByteArray();
Expand Down
9 changes: 4 additions & 5 deletions src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBCred.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import sun.security.krb5.Asn1Exception;
import sun.security.krb5.RealmException;
import sun.security.util.*;
import java.util.Vector;
import java.util.ArrayList;
import java.io.IOException;
import java.math.BigInteger;

Expand Down Expand Up @@ -134,13 +134,12 @@ private void init(DerValue encoding) throws Asn1Exception,
if (subsubDer.getTag() != DerValue.tag_SequenceOf) {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
Vector<Ticket> v = new Vector<>();
ArrayList<Ticket> v = new ArrayList<>();
while (subsubDer.getData().available() > 0) {
v.addElement(new Ticket(subsubDer.getData().getDerValue()));
v.add(new Ticket(subsubDer.getData().getDerValue()));
}
if (v.size() > 0) {
tickets = new Ticket[v.size()];
v.copyInto(tickets);
tickets = v.toArray(new Ticket[0]);
}
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
Expand Down
Loading

1 comment on commit c9dec2f

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.