TreeSet

ArraySet and AttributeNameEnumeration both were not updated to handfle Generics.
Neither are really needed,  and are likely to introduce errors.

ArraySet can be safely replaced by TreeSet.
TreeSet provides a stricter ordering constraint than ArraySet did.
This will not hurt anything, and may actually be closer to the desired behavior

AttributeNameEnumeration  was a thin wrapper around Vector.
It has been replaced with Vector<String>
In addition,  this patch cleans up the Type safety in of the collections used in the related files.

removed files from cmake

Removed custom collection files

Supressed watnings generated by the clone method.

52 files changed, 365 insertions, 583 deletions

diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index 6817f152..51d03417 100644
--- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
@@ -71,19 +71,19 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
     private IConfigStore mConfig = null;
     private IConfigStore mCRLExtConfig = null;
 
-    private Vector mCRLExtensionNames = new Vector();
-    private Vector mCRLEntryExtensionNames = new Vector();
-    private Vector mEnabledCRLExtensions = new Vector();
-    private Vector mCriticalCRLExtensions = new Vector();
-    private Hashtable mCRLExtensionClassNames = new Hashtable();
-    private Hashtable mCRLExtensionIDs = new Hashtable();
-
-    private static final Vector mDefaultCRLExtensionNames = new Vector();
-    private static final Vector mDefaultCRLEntryExtensionNames = new Vector();
-    private static final Vector mDefaultEnabledCRLExtensions = new Vector();
-    private static final Vector mDefaultCriticalCRLExtensions = new Vector();
-    private static final Hashtable mDefaultCRLExtensionClassNames = new Hashtable();
-    private static final Hashtable mDefaultCRLExtensionIDs = new Hashtable();
+    private Vector<String> mCRLExtensionNames = new Vector<String>();
+    private Vector<String> mCRLEntryExtensionNames = new Vector<String>();
+    private Vector<String> mEnabledCRLExtensions = new Vector<String>();
+    private Vector<String> mCriticalCRLExtensions = new Vector<String>();
+    private Hashtable<String, String> mCRLExtensionClassNames = new Hashtable<String, String>();
+    private Hashtable<String, String> mCRLExtensionIDs = new Hashtable<String, String>();
+
+    private static final Vector<String> mDefaultCRLExtensionNames = new Vector<String>();
+    private static final Vector<String> mDefaultCRLEntryExtensionNames = new Vector<String>();
+    private static final Vector<String> mDefaultEnabledCRLExtensions = new Vector<String>();
+    private static final Vector<String> mDefaultCriticalCRLExtensions = new Vector<String>();
+    private static final Hashtable<String, String> mDefaultCRLExtensionClassNames = new Hashtable<String, String>();
+    private static final Hashtable<String, String> mDefaultCRLExtensionIDs = new Hashtable<String, String>();
 
     private ILogger mLogger = CMS.getLogger();
 
@@ -215,10 +215,10 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
         }	
 
         if (crlExtConfig != null) {
-            Enumeration enumExts = crlExtConfig.getSubStoreNames();
+            Enumeration<String> enumExts = crlExtConfig.getSubStoreNames();
 
             while (enumExts.hasMoreElements()) {
-                String extName = (String) enumExts.nextElement();
+                String extName =  enumExts.nextElement();
                 IConfigStore extConfig = crlExtConfig.getSubStore(extName);
 
                 if (extConfig != null) {
@@ -357,19 +357,21 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
                 mCRLExtensionClassNames.put(extName, extClass);
 
                 try {
-                    Class crlExtClass = Class.forName(extClass);
+                    Class<ICMSCRLExtension> crlExtClass = (Class<ICMSCRLExtension>) Class.forName(extClass);
 
                     if (crlExtClass != null) {
-                        ICMSCRLExtension cmsCRLExt = (ICMSCRLExtension) crlExtClass.newInstance();
+                        ICMSCRLExtension cmsCRLExt =  crlExtClass.newInstance();
 
                         if (cmsCRLExt != null) {
-                            String id = (String) cmsCRLExt.getCRLExtOID();
+                            String id =  cmsCRLExt.getCRLExtOID();
 
                             if (id != null) {
                                 mCRLExtensionIDs.put(id, extName);
                             }
                         }
                     }
+                } catch (ClassCastException e) {
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRLEXTS_INCORRECT_CLASS", extClass, e.toString()));
                 } catch (ClassNotFoundException e) {
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRLEXTS_CLASS_NOT_FOUND", extClass, e.toString()));
                 } catch (InstantiationException e) {
@@ -380,7 +382,7 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
 
             } else {
                 if (mDefaultCRLExtensionClassNames.containsKey(extName)) {
-                    extClass = (String) mCRLExtensionClassNames.get(extName);
+                    extClass =  mCRLExtensionClassNames.get(extName);
                     extConfig.putString(PROP_CLASS, extClass);
                     modifiedConfig = true;
                 }
@@ -388,14 +390,14 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
             }
         } catch (EPropertyNotFound e) {
             if (mDefaultCRLExtensionClassNames.containsKey(extName)) {
-                extClass = (String) mDefaultCRLExtensionClassNames.get(extName);
+                extClass =  mDefaultCRLExtensionClassNames.get(extName);
                 extConfig.putString(PROP_CLASS, extClass);
                 modifiedConfig = true;
             }
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRLEXTS_CLASS_MISSING", extName));
         } catch (EBaseException e) {
             if (mDefaultCRLExtensionClassNames.containsKey(extName)) {
-                extClass = (String) mDefaultCRLExtensionClassNames.get(extName);
+                extClass =  mDefaultCRLExtensionClassNames.get(extName);
                 extConfig.putString(PROP_CLASS, extClass);
                 modifiedConfig = true;
             }
@@ -426,28 +428,28 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
         String name = null;
 
         if (mCRLExtensionIDs.containsKey(id)) {
-            name = (String) mCRLExtensionIDs.get(id);
+            name =  mCRLExtensionIDs.get(id);
         }
         return name;
     }
 
-    public Vector getCRLExtensionNames() {
-        return (Vector) mCRLExtensionNames.clone();
+    public Vector<String> getCRLExtensionNames() {
+        return new Vector<String>(mCRLExtensionNames);
     }
 
-    public Vector getCRLEntryExtensionNames() {
-        return (Vector) mCRLEntryExtensionNames.clone();
+    public Vector<String> getCRLEntryExtensionNames() {
+        return new Vector<String>( mCRLEntryExtensionNames);
     }
 
     public void addToCRLExtensions(CRLExtensions crlExts, String extName, Extension ext) {
         if (mCRLExtensionClassNames.containsKey(extName)) {
-            String name = (String) mCRLExtensionClassNames.get(extName);
+            String name =  mCRLExtensionClassNames.get(extName);
 
             try {
-                Class extClass = Class.forName(name);
+                Class<ICMSCRLExtension > extClass = (Class<ICMSCRLExtension>) Class.forName(name);
 
                 if (extClass != null) {
-                    ICMSCRLExtension cmsCRLExt = (ICMSCRLExtension) extClass.newInstance();
+                    ICMSCRLExtension cmsCRLExt = extClass.newInstance();
 
                     if (cmsCRLExt != null) {
                         if (ext != null) {
@@ -466,6 +468,8 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
                         }
                     }
                 }
+            } catch (ClassCastException e) {
+                log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRLEXTS_INCORRECT_CLASS", name, e.toString()));
             } catch (ClassNotFoundException e) {
                 log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRLEXTS_CLASS_NOT_FOUND", name, e.toString()));
             } catch (InstantiationException e) {
@@ -511,12 +515,12 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
             }
 
             if (mCRLExtensionClassNames.containsKey(id)) {
-                String name = (String) mCRLExtensionClassNames.get(id);
+                String name =  mCRLExtensionClassNames.get(id);
 
                 if (name != null) {
 
                     try {
-                        Class extClass = Class.forName(name);
+                        Class<?> extClass = Class.forName(name);
 
                         if (extClass != null) {
                             ICMSCRLExtension cmsCRLExt = (ICMSCRLExtension) extClass.newInstance();
@@ -662,10 +666,10 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
     }
 
     public String getClassPath(String name) {
-        Enumeration enum1 = mCRLExtensionClassNames.elements();
+        Enumeration<String> enum1 = mCRLExtensionClassNames.elements();
 
         while (enum1.hasMoreElements()) {
-            String extClassName = (String) enum1.nextElement();
+            String extClassName = enum1.nextElement();
 
             if (extClassName != null) {
                 int i = extClassName.lastIndexOf('.');
diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index e939d03e..bc859910 100644
--- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -29,9 +29,9 @@ import java.util.Hashtable;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
+import java.util.TreeSet;
 import java.util.Vector;
 
-import netscape.security.util.ArraySet;
 import netscape.security.util.BitArray;
 import netscape.security.x509.AlgorithmId;
 import netscape.security.x509.CRLExtensions;
@@ -72,7 +72,7 @@ import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord;
 import com.netscape.certsrv.dbs.crldb.ICRLRepository;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.publish.ICRLPublisher;
+import com.netscape.certsrv.publish.ILdapRule;
 import com.netscape.certsrv.publish.IPublisherProcessor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestListener;
@@ -122,7 +122,6 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
     private IConfigStore mConfigStore;
 
-    private ICRLPublisher mCRLPublisher = null;
     private int mCountMod = 0;
     private int mCount = 0;
     private int mPageSize = CRL_PAGE_SIZE;
@@ -163,16 +162,16 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
     /**
      * CRL cache
      */
-    private Hashtable mCRLCerts = new Hashtable();
-    private Hashtable mRevokedCerts = new Hashtable();
-    private Hashtable mUnrevokedCerts = new Hashtable();
-    private Hashtable mExpiredCerts = new Hashtable();
+    private Hashtable<BigInteger,RevokedCertificate> mCRLCerts = new Hashtable<BigInteger, RevokedCertificate>();
+    private Hashtable<BigInteger,RevokedCertificate> mRevokedCerts = new Hashtable<BigInteger, RevokedCertificate>();
+    private Hashtable<BigInteger,RevokedCertificate> mUnrevokedCerts = new Hashtable<BigInteger, RevokedCertificate>();
+    private Hashtable<BigInteger,RevokedCertificate> mExpiredCerts = new Hashtable<BigInteger, RevokedCertificate>();
     private boolean mIncludeExpiredCerts = false;
     private boolean mIncludeExpiredCertsOneExtraTime = false;
     private boolean mCACertsOnly = false;
 
     private boolean mProfileCertsOnly = false;
-    private Vector  mProfileList = null;
+    private Vector<String>  mProfileList = null;
 
     /**
      * Enable CRL cache.
@@ -209,7 +208,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
      * Enable CRL daily updates at listed times.
      */
     private boolean mEnableDailyUpdates = false;
-    private Vector mDailyUpdates = null; 
+    private Vector<Vector<Integer>> mDailyUpdates = null; 
     private int mCurrentDay = 0;
     private int mLastDay = 0;
     private int mTimeListSize = 0;
@@ -407,7 +406,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
         if (mProfileCertsOnly && mProfileList != null && mProfileList.size() > 0) {
             for (int k = 0; k < mProfileList.size(); k++) {
-                String profileId = (String) mProfileList.elementAt(k);
+                String profileId = mProfileList.elementAt(k);
                 if (id != null && profileId != null && profileId.equalsIgnoreCase(id)) {
                     b = true;
                     break;
@@ -513,16 +512,16 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         return ((h * 60) + m);
     }
 
-    private boolean areTimeListsIdentical(Vector list1, Vector list2) {
+    private boolean areTimeListsIdentical(Vector<Vector<Integer>> list1, Vector<Vector<Integer>> list2) {
         boolean identical = true;
         if (list1 == null || list2 == null) identical = false;
         if (identical && list1.size() != list2.size()) identical = false;
         for (int i = 0; identical && i < list1.size(); i++) {
-            Vector times1 = (Vector)list1.elementAt(i);
-            Vector times2 = (Vector)list2.elementAt(i);
+            Vector<Integer> times1 = list1.elementAt(i);
+            Vector<Integer> times2 = list2.elementAt(i);
             if (times1.size() != times2.size()) identical = false;
             for (int j = 0; identical && j < times1.size(); j++) {
-                if ((((Integer)(times1.elementAt(j))).intValue()) != (((Integer)(times2.elementAt(j))).intValue())) {
+                if ((((times1.elementAt(j))).intValue()) != (((times2.elementAt(j))).intValue())) {
                     identical = false;
                 }
             }
@@ -531,16 +530,11 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         return identical;
     }
 
-    private int getTimeListDays(Vector listedDays) {
-        int days = (listedDays != null)? listedDays.size(): 0;
-        CMS.debug("getTimeListDays: "+days);
-        return days;
-    }
+    private int getTimeListSize(Vector<Vector<Integer>> listedDays) {
 
-    private int getTimeListSize(Vector listedDays) {
         int listSize = 0;
         for (int i = 0; listedDays != null && i < listedDays.size(); i++) {
-            Vector listedTimes = (Vector)listedDays.elementAt(i);
+            Vector<Integer> listedTimes = listedDays.elementAt(i);
             listSize += ((listedTimes != null)? listedTimes.size(): 0);
         }
         CMS.debug("getTimeListSize:  ListSize="+listSize);
@@ -554,16 +548,15 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
        return extendedTimeList;
     }
 
-    private Vector getTimeList(String list) {
+    private Vector<Vector<Integer>> getTimeList(String list) {
         boolean timeListPresent = false;
         if (list == null || list.length() == 0) return null;
         if (list.charAt(0) == ',' || list.charAt(list.length()-1) == ',') return null;
 
-        Vector listedDays = new Vector();
+        Vector<Vector<Integer>> listedDays = new Vector<Vector<Integer>>();
 
         StringTokenizer days = new StringTokenizer(list, ";", true);
-        int n = 0;
-        Vector listedTimes = null;
+        Vector<Integer> listedTimes = null;
         while (days.hasMoreTokens()) {
             String dayList = days.nextToken().trim();
             if (dayList == null) continue;
@@ -572,16 +565,14 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 if (timeListPresent) {
                     timeListPresent = false;
                 } else {
-                    listedTimes = new Vector();
+                    listedTimes = new Vector<Integer>();
                     listedDays.addElement(listedTimes);
-                    n++;
                 }
                 continue;
             } else {
-                listedTimes = new Vector();
+                listedTimes = new Vector<Integer>();
                 listedDays.addElement(listedTimes);
                 timeListPresent = true;
-                n++;
             }
             int t0 = -1;
             StringTokenizer times = new StringTokenizer(dayList, ",");
@@ -606,18 +597,17 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
             }
         }
         if (!timeListPresent) {
-            listedTimes = new Vector();
-            listedDays.addElement(listedTimes);
-            n++;
+            listedTimes = new Vector<Integer>();
+            listedDays.addElement(listedTimes);            
         }
 
         return listedDays;
     }
 
-    private String checkProfile(String id, Enumeration e) {
+    private String checkProfile(String id, Enumeration<String> e) {
         if (e != null) {
             while (e.hasMoreElements()) {
-                String profileId = (String) e.nextElement();
+                String profileId =  e.nextElement();
                 if (profileId != null && profileId.equalsIgnoreCase(id))
                     return id;
             }
@@ -625,14 +615,14 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         return null;
     }
 
-    private Vector getProfileList(String list) {
-        Enumeration e = null;
+    private Vector<String> getProfileList(String list) {
+        Enumeration<String> e = null;
         IConfigStore pc = CMS.getConfigStore().getSubStore("profile");
         if (pc != null) e = pc.getSubStoreNames();
         if (list == null) return null;
         if (list.length() > 0 && list.charAt(list.length()-1) == ',') return null;
 
-        Vector listedProfiles = new Vector();
+        Vector<String> listedProfiles = new Vector<String>();
 
         StringTokenizer elements = new StringTokenizer(list, ",", true);
         int t0 = -1;
@@ -849,15 +839,15 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                             if (mCRLCacheIsCleared && mUpdatingCRL == CRL_UPDATE_DONE) {
                                 mRevokedCerts = crlRecord.getRevokedCerts();
                                 if (mRevokedCerts == null) {
-                                    mRevokedCerts = new Hashtable();
+                                    mRevokedCerts = new Hashtable<BigInteger, RevokedCertificate>();
                                 }
                                 mUnrevokedCerts = crlRecord.getUnrevokedCerts();
                                 if (mUnrevokedCerts == null) {
-                                    mUnrevokedCerts = new Hashtable();
+                                    mUnrevokedCerts = new Hashtable<BigInteger, RevokedCertificate>();
                                 }
                                 mExpiredCerts = crlRecord.getExpiredCerts();
                                 if (mExpiredCerts == null) {
-                                    mExpiredCerts = new Hashtable();
+                                    mExpiredCerts = new Hashtable<BigInteger, RevokedCertificate>();
                                 }
                                 if (isDeltaCRLEnabled()) {
                                     mNextUpdate = x509crl.getNextUpdate();
@@ -987,7 +977,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
                 if (name.equals(Constants.PR_DAILY_UPDATES)) {
                     boolean extendedTimeList = isTimeListExtended(value);
-                    Vector dailyUpdates = getTimeList(value);
+                    Vector<Vector<Integer>> dailyUpdates = getTimeList(value);
                     if (mExtendedTimeList != extendedTimeList) {
                         mExtendedTimeList = extendedTimeList;
                         modifiedSchedule = true;
@@ -1190,12 +1180,14 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 }
 
                 if (name.equals(Constants.PR_PROFILE_LIST)) {
-                    Vector profileList = getProfileList(value);
+                    Vector<String> profileList = getProfileList(value);
                     if (((profileList != null) ^ (mProfileList != null)) ||
                         (profileList != null && mProfileList != null &&
                         (!mProfileList.equals(profileList)))) {
                         if (profileList != null) {
-                            mProfileList = (Vector) profileList.clone();
+                            @SuppressWarnings("unchecked")
+                            Vector<String> newProfileList =  (Vector<String>) profileList.clone();
+                            mProfileList = newProfileList;
                         } else {
                             mProfileList = null;
                         }
@@ -1388,15 +1380,11 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
      *
      * @return set of all the revoked certificates or null if there are none.
      */
-    public Set getRevokedCertificates(int start, int end) {
+    public Set<RevokedCertificate> getRevokedCertificates(int start, int end) {
         if (mCRLCacheIsCleared || mCRLCerts == null || mCRLCerts.isEmpty()) {
             return null;
         } else {
-            ArraySet certSet = new ArraySet();
-            Collection badCerts = mCRLCerts.values();
-            Object[] objs = badCerts.toArray();
-            for (int i = start; i < end && i < objs.length; i++)
-                certSet.add(objs[i]);
+            Set<RevokedCertificate> certSet = new TreeSet<RevokedCertificate>(mCRLCerts.values());
             return certSet;
         }
     }
@@ -1531,10 +1519,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         if (mEnableDailyUpdates &&
             mDailyUpdates != null && mDailyUpdates.size() > 0) {
             int n = 0;
-            if (mDailyUpdates.size() == 1 && ((Vector)mDailyUpdates.elementAt(0)).size() == 1 &&
+            if (mDailyUpdates.size() == 1 && mDailyUpdates.elementAt(0).size() == 1 &&
                 mEnableUpdateFreq && mAutoUpdateInterval > 0) {
                 // Interval updates with starting time
-                long firstTime = MINUTE * ((Integer)((Vector)mDailyUpdates.elementAt(0)).elementAt(0)).longValue();
+                long firstTime = MINUTE * ((Integer)mDailyUpdates.elementAt(0).elementAt(0)).longValue();
                 long t = firstTime;
                 long interval = mAutoUpdateInterval;
                 if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) &&
@@ -1572,11 +1560,11 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 }
                 int i, m;
                 for (i = 0, m = 0; i < mCurrentDay; i++) {
-                    m += ((Vector)mDailyUpdates.elementAt(i)).size();
+                    m += mDailyUpdates.elementAt(i).size();
                 }
                 // search the current day
-                for (i = 0; i < ((Vector)mDailyUpdates.elementAt(mCurrentDay)).size(); i++) {
-                    long t = MINUTE * ((Integer)((Vector)mDailyUpdates.elementAt(mCurrentDay)).elementAt(i)).longValue();
+                for (i = 0; i < mDailyUpdates.elementAt(mCurrentDay).size(); i++) {
+                    long t = MINUTE * ((Integer)mDailyUpdates.elementAt(mCurrentDay).elementAt(i)).longValue();
                     if (mEnableDailyUpdates && mExtendedTimeList) {
                         if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) && isDeltaEnabled) {
                             if (t < 0) {
@@ -1600,9 +1588,9 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     n++;
                 }
 
-                if (i < ((Vector)mDailyUpdates.elementAt(mCurrentDay)).size()) {
+                if (i < mDailyUpdates.elementAt(mCurrentDay).size()) {
                     // found inside the current day
-                    next = (MINUTE * ((Integer)((Vector)mDailyUpdates.elementAt(mCurrentDay)).elementAt(i)).longValue());
+                    next = (MINUTE * ((Integer)mDailyUpdates.elementAt(mCurrentDay).elementAt(i)).longValue());
                     if (mEnableDailyUpdates && mExtendedTimeList && next < 0) {
                         next *= -1;
                         if (fromLastUpdate) {
@@ -1623,15 +1611,15 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     }
                 } else {
                     // done with today
-                    int j = i - ((Vector)mDailyUpdates.elementAt(mCurrentDay)).size();
+                    int j = i - mDailyUpdates.elementAt(mCurrentDay).size();
                     int nDays = 1;
                     long t = 0;
                     if (mDailyUpdates.size() > 1) {
                         while (nDays <= mDailyUpdates.size()) {
                             int nextDay = (mCurrentDay + nDays) % mDailyUpdates.size();
-                            if (j < ((Vector)mDailyUpdates.elementAt(nextDay)).size()) {
+                            if (j < mDailyUpdates.elementAt(nextDay).size()) {
                                 if (nextDay == 0 && (!(mEnableDailyUpdates && mExtendedTimeList))) j = 0;
-                                t = MINUTE * ((Integer)((Vector)mDailyUpdates.elementAt(nextDay)).elementAt(j)).longValue();
+                                t = MINUTE * ((Integer)mDailyUpdates.elementAt(nextDay).elementAt(j)).longValue();
                                 if (mEnableDailyUpdates && mExtendedTimeList) {
                                     if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) && isDeltaEnabled) {
                                         if (t < 0) {
@@ -1651,7 +1639,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                                 }
                                 break;
                             } else {
-                                j -= ((Vector)mDailyUpdates.elementAt(nextDay)).size();
+                                j -= mDailyUpdates.elementAt(nextDay).size();
                             }
                             nDays++;
                         }
@@ -1816,7 +1804,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 filter += "(|";
             }
             for (int k = 0; k < mProfileList.size(); k++) {
-                String id = (String) mProfileList.elementAt(k);
+                String id = mProfileList.elementAt(k);
                 filter += "(" + CertRecord.ATTR_META_INFO + "=profileId:" + id + ")";
             }
             if (mProfileList.size() > 1) {
@@ -1996,9 +1984,9 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         CMSCRLExtensions exts = (CMSCRLExtensions) this.getCRLExtensions();
         CRLExtensions ext = new CRLExtensions();
         
-        Vector extNames = exts.getCRLExtensionNames();
+        Vector<String> extNames = exts.getCRLExtensionNames();
             for (int i = 0; i < extNames.size(); i++) {
-                String curName = (String) extNames.elementAt(i);
+                String curName = extNames.elementAt(i);
                 if (curName.equals(extName)) {
                    exts.addToCRLExtensions(ext, extName, null);
                 }
@@ -2020,10 +2008,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
         if (mAllowExtensions && exts != null && exts.size() > 0) {
             entryExt = new CRLExtensions();
-            Vector extNames = mCMSCRLExtensions.getCRLEntryExtensionNames();
+            Vector<String> extNames = mCMSCRLExtensions.getCRLEntryExtensionNames();
 
             for (int i = 0; i < extNames.size(); i++) {
-                String extName = (String) extNames.elementAt(i);
+                String extName = extNames.elementAt(i);
 
                 if (mCMSCRLExtensions.isCRLExtensionEnabled(extName)) {
                     int k;
@@ -2088,7 +2076,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                         RevokedCertImpl newRevokedCert =
                             new RevokedCertImpl(serialNumber, revocationDate, entryExt);
 
-                        mCRLCerts.put(serialNumber, (RevokedCertificate) newRevokedCert);
+                        mCRLCerts.put(serialNumber, newRevokedCert);
                     }
                 } else {
                     Date revocationDate = revokedCert.getRevocationDate();
@@ -2269,7 +2257,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         Date revocationDate = null;
 
         if (mCRLCerts.containsKey(serialNumber)) {
-            revocationDate = ((RevokedCertificate) mCRLCerts.get(serialNumber)).getRevocationDate();
+            revocationDate = mCRLCerts.get(serialNumber).getRevocationDate();
         }
 
         if (checkDeltaCache && isDeltaCRLEnabled()) {
@@ -2277,7 +2265,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 revocationDate = null;
             }
             if (mRevokedCerts.containsKey(serialNumber)) {
-                revocationDate = ((RevokedCertificate) mRevokedCerts.get(serialNumber)).getRevocationDate();
+                revocationDate = mRevokedCerts.get(serialNumber).getRevocationDate();
             }
             if (!includeExpiredCerts && mExpiredCerts.containsKey(serialNumber)) {
                 revocationDate = null;
@@ -2287,8 +2275,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         return revocationDate;
     }
 
-    public Vector getSplitTimes() {
-        Vector splits = new Vector();
+    public Vector<Long> getSplitTimes() {
+        Vector<Long> splits = new Vector<Long>();
 
         for (int i = 0; i < mSplits.length; i++) {
             splits.addElement(Long.valueOf(mSplits[i]));
@@ -2377,9 +2365,12 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         }
 
         mSplits[0] -= System.currentTimeMillis();
-        Hashtable clonedRevokedCerts = (Hashtable) mRevokedCerts.clone();
-        Hashtable clonedUnrevokedCerts = (Hashtable) mUnrevokedCerts.clone();
-        Hashtable clonedExpiredCerts = (Hashtable) mExpiredCerts.clone();
+        @SuppressWarnings("unchecked")
+        Hashtable<BigInteger, RevokedCertificate> clonedRevokedCerts = (Hashtable<BigInteger, RevokedCertificate>)mRevokedCerts.clone();
+        @SuppressWarnings("unchecked")
+        Hashtable<BigInteger, RevokedCertificate> clonedUnrevokedCerts = (Hashtable<BigInteger, RevokedCertificate>)mUnrevokedCerts.clone();
+        @SuppressWarnings("unchecked")
+        Hashtable<BigInteger, RevokedCertificate> clonedExpiredCerts = (Hashtable<BigInteger, RevokedCertificate> )mExpiredCerts.clone();
 
         mSplits[0] += System.currentTimeMillis();
 
@@ -2417,15 +2408,16 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         } else {
             if (isDeltaCRLEnabled()) {
                 mSplits[1] -= System.currentTimeMillis();
-                Hashtable deltaCRLCerts = (Hashtable) clonedRevokedCerts.clone();
+                @SuppressWarnings("unchecked")
+                Hashtable<BigInteger, RevokedCertificate> deltaCRLCerts = (Hashtable<BigInteger, RevokedCertificate> )clonedRevokedCerts.clone();
 
                 deltaCRLCerts.putAll(clonedUnrevokedCerts);
                 if (mIncludeExpiredCertsOneExtraTime) {
                     if (!clonedExpiredCerts.isEmpty()) {
-                        for (Enumeration e = clonedExpiredCerts.keys(); e.hasMoreElements();) {
-                            BigInteger serialNumber = (BigInteger) e.nextElement();
+                        for (Enumeration<BigInteger> e = clonedExpiredCerts.keys(); e.hasMoreElements();) {
+                            BigInteger serialNumber = e.nextElement();
                             if ((mLastFullUpdate != null &&
-                                 mLastFullUpdate.after(((RevokedCertificate)(mExpiredCerts.get(serialNumber))).getRevocationDate())) ||
+                                 mLastFullUpdate.after((mExpiredCerts.get(serialNumber)).getRevocationDate())) ||
                                  mLastFullUpdate == null) {
                                 deltaCRLCerts.put(serialNumber, clonedExpiredCerts.get(serialNumber));
                             }
@@ -2438,10 +2430,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 mLastCRLNumber = mCRLNumber;
 
                 CRLExtensions ext = new CRLExtensions();
-                Vector extNames = mCMSCRLExtensions.getCRLExtensionNames();
+                Vector<String> extNames = mCMSCRLExtensions.getCRLExtensionNames();
 
                 for (int i = 0; i < extNames.size(); i++) {
-                    String extName = (String) extNames.elementAt(i);
+                    String extName = extNames.elementAt(i);
 
                     if (mCMSCRLExtensions.isCRLExtensionEnabled(extName) &&
                         (!extName.equals(FreshestCRLExtension.NAME))) {
@@ -2542,8 +2534,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     (mCRLCerts.isEmpty() && (mCRLSize == 0) && (!clonedRevokedCerts.isEmpty()))) {
 
                     if (!clonedUnrevokedCerts.isEmpty()) {
-                        for (Enumeration e = clonedUnrevokedCerts.keys(); e.hasMoreElements();) {
-                            BigInteger serialNumber = (BigInteger) e.nextElement();
+                        for (Enumeration<BigInteger> e = clonedUnrevokedCerts.keys(); e.hasMoreElements();) {
+                            BigInteger serialNumber = e.nextElement();
 
                             if (mCRLCerts.containsKey(serialNumber)) {
                                 mCRLCerts.remove(serialNumber);
@@ -2553,8 +2545,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     }
 
                     if (!clonedRevokedCerts.isEmpty()) {
-                        for (Enumeration e = clonedRevokedCerts.keys(); e.hasMoreElements();) {
-                            BigInteger serialNumber = (BigInteger) e.nextElement();
+                        for (Enumeration<BigInteger> e = clonedRevokedCerts.keys(); e.hasMoreElements();) {
+                            BigInteger serialNumber = e.nextElement();
 
                             mCRLCerts.put(serialNumber, mRevokedCerts.get(serialNumber));
                             mRevokedCerts.remove(serialNumber);
@@ -2562,12 +2554,12 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     }
 
                     if (!clonedExpiredCerts.isEmpty()) {
-                        for (Enumeration e = clonedExpiredCerts.keys(); e.hasMoreElements();) {
-                            BigInteger serialNumber = (BigInteger) e.nextElement();
+                        for (Enumeration<BigInteger> e = clonedExpiredCerts.keys(); e.hasMoreElements();) {
+                            BigInteger serialNumber = e.nextElement();
 
                             if ((!mIncludeExpiredCertsOneExtraTime) ||
                                  (mLastFullUpdate != null &&
-                                  mLastFullUpdate.after(((RevokedCertificate)(mExpiredCerts.get(serialNumber))).getRevocationDate())) ||
+                                  mLastFullUpdate.after((mExpiredCerts.get(serialNumber)).getRevocationDate())) ||
                                  mLastFullUpdate == null) {
                                 if (mCRLCerts.containsKey(serialNumber)) {
                                     mCRLCerts.remove(serialNumber);
@@ -2599,10 +2591,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
             if (mAllowExtensions) {
                 ext = new CRLExtensions();
-                Vector extNames = mCMSCRLExtensions.getCRLExtensionNames();
+                Vector<String> extNames = mCMSCRLExtensions.getCRLExtensionNames();
 
                 for (int i = 0; i < extNames.size(); i++) {
-                    String extName = (String) extNames.elementAt(i);
+                    String extName = extNames.elementAt(i);
 
                     if (mCMSCRLExtensions.isCRLExtensionEnabled(extName) &&
                         (!extName.equals(DeltaCRLIndicatorExtension.NAME))) {
@@ -2777,8 +2769,14 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         throws EBaseException {
         publishCRL(x509crl, false);
     }
-
-    protected void publishCRL(X509CRLImpl x509crl, boolean isDeltaCRL) 
+    
+    /*
+     *  The Session Context is a Hashtable, but without type information.
+     *  Suppress the warnings generated by adding to the session context   
+     *   
+     */
+    @SuppressWarnings("unchecked")
+	protected void publishCRL(X509CRLImpl x509crl, boolean isDeltaCRL) 
         throws EBaseException {
         SessionContext sc = SessionContext.getContext();
 
@@ -2816,7 +2814,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
             }
             if (x509crl != null &&
                 mPublisherProcessor != null && mPublisherProcessor.enabled()) {
-                Enumeration rules = mPublisherProcessor.getRules(IPublisherProcessor.PROP_LOCAL_CRL);
+                Enumeration<ILdapRule> rules = mPublisherProcessor.getRules(IPublisherProcessor.PROP_LOCAL_CRL);
                 if (rules == null || !rules.hasMoreElements()) {
                     CMS.debug("CRL publishing is not enabled.");
                 } else {
@@ -2937,7 +2935,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
 
 class CertRecProcessor implements IElementProcessor {
-    private Hashtable mCRLCerts = null;
+    private Hashtable<BigInteger, RevokedCertificate> mCRLCerts = null;
     private boolean mAllowExtensions = false;
     private ILogger mLogger;
     private CRLIssuingPoint mIP = null;
@@ -2946,7 +2944,7 @@ class CertRecProcessor implements IElementProcessor {
     private boolean mIssuingDistPointEnabled = false;
     private BitArray mOnlySomeReasons = null;
 
-    public CertRecProcessor(Hashtable crlCerts, CRLIssuingPoint ip, ILogger logger, boolean allowExtensions) {
+    public CertRecProcessor(Hashtable<BigInteger, RevokedCertificate> crlCerts, CRLIssuingPoint ip, ILogger logger, boolean allowExtensions) {
         mCRLCerts = crlCerts;
         mLogger = logger;
         mIP = ip;
@@ -2984,9 +2982,9 @@ class CertRecProcessor implements IElementProcessor {
 
        //Get info out of the IssuingDistPointExtension
         CRLExtensions ext = new CRLExtensions();
-        Vector extNames = exts.getCRLExtensionNames();
+        Vector<String> extNames = exts.getCRLExtensionNames();
             for (int i = 0; i < extNames.size(); i++) {
-                String extName = (String) extNames.elementAt(i);
+                String extName = extNames.elementAt(i);
                 if (extName.equals(IssuingDistributionPointExtension.NAME)) {
                    exts.addToCRLExtensions(ext, extName, null);
                 }
diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java
index 5353b019..a81ae362 100644
--- a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java
+++ b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java
@@ -134,7 +134,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori
     protected ISubsystem mOwner = null;
     protected IConfigStore mConfig = null;
     protected ILogger mLogger = CMS.getLogger();
-    protected Hashtable mCRLIssuePoints = new Hashtable(); 
+    protected Hashtable<String, CRLIssuingPoint> mCRLIssuePoints = new Hashtable<String, CRLIssuingPoint>(); 
     protected CRLIssuingPoint mMasterCRLIssuePoint = null; // the complete crl. 
     protected SigningUnit mSigningUnit;
     protected SigningUnit mOCSPSigningUnit;
@@ -1670,7 +1670,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori
             //throw new ECAException(CAResources.NO_CONFIG_FOR_MASTER_CRL);
             return;
         }
-        Enumeration issuePointIdEnum = crlConfig.getSubStoreNames();
+        Enumeration<String> issuePointIdEnum = crlConfig.getSubStoreNames();
 
         if (issuePointIdEnum == null || !issuePointIdEnum.hasMoreElements()) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CA_NO_MASTER_CRL_SUBSTORE"));
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java
index 1793ff23..aef83b1c 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java
@@ -249,7 +249,7 @@ public interface IConfigStore extends ISourceConfigStore {
      * Retrives and enumeration of all properties in this config-store.
      * @return An enumeration of all properties in this config-store
      */
-    public Enumeration getPropertyNames();
+    public Enumeration<String> getPropertyNames();
 
     /**
      * Returns an enumeration of the names of the substores of 
@@ -258,7 +258,7 @@ public interface IConfigStore extends ISourceConfigStore {
      * @return An enumeration of the names of the sub-stores of this 
      * config-store
      */
-    public Enumeration getSubStoreNames();
+    public Enumeration<String> getSubStoreNames();
 
     /**
      * Commits all the data into file immediately.
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
index 991a952a..78acced0 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
+++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
@@ -22,6 +22,8 @@ import java.math.BigInteger;
 import java.util.Date;
 import java.util.Hashtable;
 
+import netscape.security.x509.RevokedCertificate;
+
 import com.netscape.certsrv.dbs.IDBObj;
 
 
@@ -134,27 +136,27 @@ public interface ICRLIssuingPointRecord extends IDBObj {
      *
      * @return list of recently revoked certificates
      */
-    public Hashtable getCRLCacheNoClone();
-    public Hashtable getCRLCache();
+    public Hashtable<BigInteger,RevokedCertificate> getCRLCacheNoClone();
+    public Hashtable<BigInteger,RevokedCertificate> getCRLCache();
 
     /**
      * Retrieves cache information about revoked certificates.
      *
      * @return list of recently revoked certificates
      */
-    public Hashtable getRevokedCerts();
+    public Hashtable<BigInteger,RevokedCertificate> getRevokedCerts();
 
     /**
      * Retrieves cache information about certificates released from hold.
      *
      * @return list of certificates recently released from hold
      */
-    public Hashtable getUnrevokedCerts();
+    public Hashtable<BigInteger,RevokedCertificate> getUnrevokedCerts();
 
     /**
      * Retrieves cache information about expired certificates.
      *
      * @return list of recently expired certificates
      */
-    public Hashtable getExpiredCerts();
+    public Hashtable<BigInteger,RevokedCertificate> getExpiredCerts();
 }
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
index 0831717e..c4afd039 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
+++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
@@ -46,12 +46,12 @@ public interface ILdapMapper extends ILdapPlugin {
     /**
      * Returns the initial default parameters.
      */
-    public Vector getDefaultParams();
+    public Vector<String> getDefaultParams();
 
     /**
      * Returns the current instance parameters.
      */
-    public Vector getInstanceParams();
+    public Vector<String> getInstanceParams();
 
     /**
      * maps a certificate to a LDAP entry.
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
index df6a1e3b..5a1197dc 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
+++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
@@ -48,12 +48,12 @@ public interface ILdapPublisher extends ILdapPlugin {
     /**
      * Returns the current instance parameters.
      */
-    public Vector getInstanceParams();
+    public Vector<String> getInstanceParams();
 
     /**
      * Returns the initial default parameters.
      */
-    public Vector getDefaultParams();
+    public Vector<String> getDefaultParams();
 
     /**
      * Publish an object.
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
index bad8cbea..4c5699b1 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
+++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
@@ -64,12 +64,12 @@ public interface ILdapRule extends ILdapPlugin {
     /**
      * Returns the current instance parameters.
      */
-    public Vector getInstanceParams();
+    public Vector<String> getInstanceParams();
 
     /**
      * Returns the initial default parameters.
      */
-    public Vector getDefaultParams();
+    public Vector<String> getDefaultParams();
 
     /**
      * Returns true if the rule is enabled, false if it's disabled.
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
index af19d2db..1da2f346 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
+++ b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
@@ -68,39 +68,39 @@ public interface IPublisherProcessor extends ISubsystem {
      * Returns Hashtable of rule plugins.
      */
 
-    public Hashtable getRulePlugins();
+    public Hashtable<String, RulePlugin> getRulePlugins();
 
     /**
      *
      * Returns Hashtable of rule  instances.
      */
 
-    public Hashtable getRuleInsts();
+    public Hashtable<String, ILdapRule> getRuleInsts();
 
     /**
      *
      * Returns Hashtable of mapper plugins.
      */
 
-    public Hashtable getMapperPlugins();
+    public Hashtable<String, MapperPlugin> getMapperPlugins();
 
     /**
      *
      * Returns Hashtable of publisher plugins.
      */
-    public Hashtable getPublisherPlugins();
+    public Hashtable<String, PublisherPlugin> getPublisherPlugins();
 
     /**
      *
      * Returns Hashtable of rule mapper instances.
      */
-    public Hashtable getMapperInsts();
+    public Hashtable<String, MapperProxy> getMapperInsts();
 
     /**
      *
      * Returns Hashtable of rule publisher instances.
      */
-    public Hashtable getPublisherInsts();
+    public Hashtable<String, PublisherProxy> getPublisherInsts();
 
     /**
      *
@@ -108,7 +108,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @param publishingType Type for which to retrieve rule list.
      */
 
-    public Enumeration getRules(String publishingType);
+    public Enumeration<ILdapRule> getRules(String publishingType);
 
     /**
      *
@@ -116,7 +116,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @param publishingType Type for which to retrieve rule list.
      * @param req  Corresponding publish request.
      */
-    public Enumeration getRules(String publishingType, IRequest req);
+    public Enumeration<ILdapRule> getRules(String publishingType, IRequest req);
 
     /**
      *
@@ -124,7 +124,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @param implName name of MapperPlugin.
      */
 
-    public Vector getMapperDefaultParams(String implName) throws
+    public Vector<String> getMapperDefaultParams(String implName) throws
             ELdapException;
 
     /**
@@ -134,7 +134,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @exception ELdapException failed due to Ldap error.
      */
 
-    public Vector getMapperInstanceParams(String insName) throws
+    public Vector<String> getMapperInstanceParams(String insName) throws
             ELdapException;
 
     /**
@@ -143,7 +143,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @param implName name of PublisherPlugin.
      * @exception ELdapException failed due to Ldap error.
      */
-    public Vector getPublisherDefaultParams(String implName) throws
+    public Vector<String> getPublisherDefaultParams(String implName) throws
             ELdapException;
 
     /**
@@ -201,7 +201,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @param insName name of PublisherProxy.
      * @return Vector of current instance parameters.
      */
-    public Vector getPublisherInstanceParams(String insName) throws
+    public Vector<String> getPublisherInstanceParams(String insName) throws
             ELdapException;
 
     /**
@@ -211,7 +211,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @return Vector of initial default parameters.
      * @exception ELdapException failed due to Ldap error.
      */
-    public Vector getRuleDefaultParams(String implName) throws
+    public Vector<String> getRuleDefaultParams(String implName) throws
             ELdapException;
 
     /**
@@ -221,7 +221,7 @@ public interface IPublisherProcessor extends ISubsystem {
      * @return Vector of current instance parameters.
      * @exception ELdapException failed due to Ldap error.
      */
-    public Vector getRuleInstanceParams(String implName) throws
+    public Vector<String> getRuleInstanceParams(String implName) throws
             ELdapException;
 
     /**
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
index 1d3a949e..f0154e44 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
@@ -115,8 +115,8 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo {
     /**
      * Returns the current instance parameters.
      */
-    public Vector getInstanceParams() {
-        Vector v = new Vector();
+    public Vector<String> getInstanceParams() {
+        Vector<String> v = new Vector<String>();
         String dir = "";
         String ext = "";
 
@@ -155,8 +155,8 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo {
     /**
      * Returns the initial default parameters.
      */
-    public Vector getDefaultParams() {
-        Vector v = new Vector();
+    public Vector<String> getDefaultParams() {
+        Vector<String> v = new Vector<String>();
 
         v.addElement(PROP_DIR+"=");
         v.addElement(PROP_DER+"=true");
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
index 16bc7f02..233cbf87 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
@@ -66,20 +66,20 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
         mConfig = config;
 
         mProcessor = processor;
-        Enumeration mappers = mProcessor.getMapperInsts().keys();
-        Enumeration publishers = mProcessor.getPublisherInsts().keys();
+        Enumeration<String> mappers = mProcessor.getMapperInsts().keys();
+        Enumeration<String> publishers = mProcessor.getPublisherInsts().keys();
 
         String map = NOMAPPER;
 
         for (; mappers.hasMoreElements();) {
-            String name = (String) mappers.nextElement();
+            String name =  mappers.nextElement();
 
             map = map + "," + name;
         }
         String publish = "";
 
         for (; publishers.hasMoreElements();) {
-            String name = (String) publishers.nextElement();
+            String name =  publishers.nextElement();
 
             publish = publish + "," + name;
         }
@@ -168,11 +168,11 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
     /**
      * Returns the current instance parameters.
      */
-    public Vector getInstanceParams() {
+    public Vector<String> getInstanceParams() {
         //if (mProcessor == null) System.out.println("xxxxnull");
         //dont know why the processor was null in getExtendedPluginInfo()
-        Enumeration mappers = mProcessor.getMapperInsts().keys();
-        Enumeration publishers = mProcessor.getPublisherInsts().keys();
+        Enumeration<String> mappers = mProcessor.getMapperInsts().keys();
+        Enumeration<String> publishers = mProcessor.getPublisherInsts().keys();
         String map = NOMAPPER;
 
         for (; mappers.hasMoreElements();) {
@@ -197,7 +197,7 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
          mExtendedPluginInfo.add("predicate","string;");
          */
 
-        Vector v = new Vector();
+        Vector<String> v = new Vector<String>();
 
         try {
             v.addElement(IPublisherProcessor.PROP_TYPE + "=" + 
@@ -288,8 +288,8 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
     /**
      * Returns the initial default parameters.
      */
-    public Vector getDefaultParams() {
-        Vector v = new Vector();
+    public Vector<String> getDefaultParams() {
+        Vector<String> v = new Vector<String>();
 
         v.addElement(IPublisherProcessor.PROP_TYPE + "=");
         v.addElement(IPublisherProcessor.PROP_PREDICATE + "=");
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index a1e45a58..1477e57b 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
@@ -65,12 +65,12 @@ import com.netscape.cmscore.util.Debug;
 public class PublisherProcessor implements
 		IPublisherProcessor, IXcertPublisherProcessor {
 
-    public Hashtable mPublisherPlugins = new Hashtable();
-    public Hashtable mPublisherInsts = new Hashtable();
-    public Hashtable mMapperPlugins = new Hashtable();
-    public Hashtable mMapperInsts = new Hashtable();
-    public Hashtable mRulePlugins = new Hashtable();
-    public Hashtable mRuleInsts = new Hashtable();
+    public Hashtable<String, PublisherPlugin> mPublisherPlugins = new Hashtable<String, PublisherPlugin>();
+    public Hashtable<String, PublisherProxy> mPublisherInsts = new Hashtable<String, PublisherProxy>();
+    public Hashtable<String, MapperPlugin> mMapperPlugins = new Hashtable<String, MapperPlugin>();
+    public Hashtable<String, MapperProxy> mMapperInsts = new Hashtable<String, MapperProxy>();
+    public Hashtable<String, RulePlugin> mRulePlugins = new Hashtable<String, RulePlugin>();
+    public Hashtable<String, ILdapRule> mRuleInsts = new Hashtable<String, ILdapRule>();
 
     /**
      protected PublishRuleSet mRuleSet = null;
@@ -112,7 +112,7 @@ public class PublisherProcessor implements
         IConfigStore publisherConfig = config.getSubStore("publisher");
         IConfigStore c = publisherConfig.getSubStore(PROP_IMPL);
         mCreateOwnDNEntry = mConfig.getBoolean("createOwnDNEntry", false);
-        Enumeration mImpls = c.getSubStoreNames();
+        Enumeration<String> mImpls = c.getSubStoreNames();
 
         while (mImpls.hasMoreElements()) {
             String id = (String) mImpls.nextElement();
@@ -126,7 +126,7 @@ public class PublisherProcessor implements
 
             // load publisher instances
         c = publisherConfig.getSubStore(PROP_INSTANCE);
-        Enumeration instances = c.getSubStoreNames();
+        Enumeration<String> instances = c.getSubStoreNames();
 
         while (instances.hasMoreElements()) {
             String insName = (String) instances.nextElement();
@@ -460,35 +460,35 @@ public class PublisherProcessor implements
         }
     }
 
-    public Hashtable getRulePlugins() {
+    public Hashtable<String, RulePlugin> getRulePlugins() {
         return mRulePlugins;
     }
 
-    public Hashtable getRuleInsts() {
+    public Hashtable<String, ILdapRule> getRuleInsts() {
         return mRuleInsts;
     }
 
-    public Hashtable getMapperPlugins() {
+    public Hashtable<String, MapperPlugin> getMapperPlugins() {
         return mMapperPlugins;
     }
 
-    public Hashtable getPublisherPlugins() {
+    public Hashtable<String, PublisherPlugin> getPublisherPlugins() {
         return mPublisherPlugins;
     }
 
-    public Hashtable getMapperInsts() {
+    public Hashtable<String, MapperProxy> getMapperInsts() {
         return mMapperInsts;
     }
 
-    public Hashtable getPublisherInsts() {
+    public Hashtable<String, PublisherProxy> getPublisherInsts() {
         return mPublisherInsts;
     }
 
     //certType can be client,server,ca,crl,smime
     //XXXshould make it static to make it faster
-    public Enumeration getRules(String publishingType) {
-        Vector rules = new Vector();
-        Enumeration e = mRuleInsts.keys();
+    public Enumeration<ILdapRule> getRules(String publishingType) {
+        Vector<ILdapRule> rules = new Vector<ILdapRule>();
+        Enumeration<String> e = mRuleInsts.keys();
 			
         while (e.hasMoreElements()) {
             String name = (String) e.nextElement();
@@ -525,13 +525,13 @@ public class PublisherProcessor implements
         return rules.elements();
     }
 
-    public Enumeration getRules(String publishingType, IRequest req) {
+    public Enumeration<ILdapRule> getRules(String publishingType, IRequest req) {
         if (req == null) {
             return getRules(publishingType);
         }
 
-        Vector rules = new Vector();
-        Enumeration e = mRuleInsts.keys();
+        Vector<ILdapRule> rules = new Vector<ILdapRule>();
+        Enumeration<String> e = mRuleInsts.keys();
 			
         while (e.hasMoreElements()) {
             String name = (String) e.nextElement();
@@ -575,11 +575,10 @@ public class PublisherProcessor implements
      }
      **/
 
-    public Vector getMapperDefaultParams(String implName) throws
+    public Vector<String> getMapperDefaultParams(String implName) throws
             ELdapException {
         // is this a registered implname?
-        MapperPlugin plugin = (MapperPlugin)
-            mMapperPlugins.get(implName);
+        MapperPlugin plugin = mMapperPlugins.get(implName);
 
         if (plugin == null) {
             log(ILogger.LL_FAILURE,
@@ -597,7 +596,7 @@ public class PublisherProcessor implements
         try {
             mapperInst = (ILdapMapper)
                     Class.forName(className).newInstance();
-            Vector v = mapperInst.getDefaultParams();
+            Vector<String> v = mapperInst.getDefaultParams();
 
             return v;
         } catch (InstantiationException e) {
@@ -612,7 +611,7 @@ public class PublisherProcessor implements
         }
     }
 
-    public Vector getMapperInstanceParams(String insName) throws
+    public Vector<String> getMapperInstanceParams(String insName) throws
             ELdapException {
         ILdapMapper mapperInst = null;
         MapperProxy proxy = (MapperProxy) mMapperInsts.get(insName);
@@ -624,12 +623,12 @@ public class PublisherProcessor implements
         if (mapperInst == null) {
             return null;
         }
-        Vector v = mapperInst.getInstanceParams();
+        Vector<String> v = mapperInst.getInstanceParams();
 
         return v;
     }
 
-    public Vector getPublisherDefaultParams(String implName) throws
+    public Vector<String> getPublisherDefaultParams(String implName) throws
             ELdapException {
         // is this a registered implname?
         PublisherPlugin plugin = (PublisherPlugin)
@@ -651,7 +650,7 @@ public class PublisherProcessor implements
         try {
             publisherInst = (ILdapPublisher)
                     Class.forName(className).newInstance();
-            Vector v = publisherInst.getDefaultParams();
+            Vector<String> v = publisherInst.getDefaultParams();
 
             return v;
         } catch (InstantiationException e) {
@@ -728,23 +727,22 @@ public class PublisherProcessor implements
         return proxy.getPublisher();
     }
 
-    public Vector getPublisherInstanceParams(String insName) throws
+    public Vector<String> getPublisherInstanceParams(String insName) throws
             ELdapException {
         ILdapPublisher publisherInst = getPublisherInstance(insName);
 
         if (publisherInst == null) {
             return null;
         }
-        Vector v = publisherInst.getInstanceParams();
+        Vector<String> v = publisherInst.getInstanceParams();
 
         return v;
     }
 
-    public Vector getRuleDefaultParams(String implName) throws
+    public Vector<String> getRuleDefaultParams(String implName) throws
             ELdapException {
         // is this a registered implname?
-        RulePlugin plugin = (RulePlugin)
-            mRulePlugins.get(implName);
+        RulePlugin plugin = mRulePlugins.get(implName);
 
         if (plugin == null) {
             log(ILogger.LL_FAILURE,
@@ -763,7 +761,7 @@ public class PublisherProcessor implements
             ruleInst = (ILdapRule)
                     Class.forName(className).newInstance();
 			
-            Vector v = ruleInst.getDefaultParams();
+            Vector<String> v = ruleInst.getDefaultParams();
 
             return v;
         } catch (InstantiationException e) {
@@ -778,11 +776,10 @@ public class PublisherProcessor implements
         }
     }
 
-    public Vector getRuleInstanceParams(String implName) throws
+    public Vector<String> getRuleInstanceParams(String implName) throws
             ELdapException {
         // is this a registered implname?
-        RulePlugin plugin = (RulePlugin)
-            mRulePlugins.get(implName);
+        RulePlugin plugin = mRulePlugins.get(implName);
 
         if (plugin == null) {
             log(ILogger.LL_FAILURE,
@@ -800,7 +797,7 @@ public class PublisherProcessor implements
         try {
             ruleInst = (ILdapRule)
                     Class.forName(className).newInstance();
-            Vector v = ruleInst.getInstanceParams();
+            Vector<String> v = ruleInst.getInstanceParams();
             IConfigStore rc = ruleInst.getConfigStore();
 
             return v;
@@ -864,7 +861,7 @@ public class PublisherProcessor implements
         CMS.debug("PublishProcessor::publishCACert");
 
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules(PROP_LOCAL_CA);
+        Enumeration<ILdapRule> rules = getRules(PROP_LOCAL_CA);
 
         if (rules == null || !rules.hasMoreElements()) {
             if (isClone()) {
@@ -934,7 +931,7 @@ public class PublisherProcessor implements
             return;
 
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules(PROP_LOCAL_CA);
+        Enumeration<ILdapRule> rules = getRules(PROP_LOCAL_CA);
 
         if (rules == null || !rules.hasMoreElements()) {
             if (isClone()) {
@@ -1001,7 +998,7 @@ public class PublisherProcessor implements
 		CMS.debug("PublisherProcessor: in publishXCertPair()");
 
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules(PROP_XCERT);
+        Enumeration<ILdapRule> rules = getRules(PROP_XCERT);
 
         if (rules == null || !rules.hasMoreElements()) {
             if (isClone()) {
@@ -1063,7 +1060,7 @@ public class PublisherProcessor implements
             return;
 
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules("certs", req);
+        Enumeration<ILdapRule> rules = getRules("certs", req);
 
          // Bugscape  #52306  -  Remove superfluous log messages on failure
         if (rules == null || !rules.hasMoreElements()) {
@@ -1120,7 +1117,7 @@ public class PublisherProcessor implements
             return;
 
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules("certs", req);
+        Enumeration<ILdapRule> rules = getRules("certs", req);
 
         if (rules == null || !rules.hasMoreElements()) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_NO_UNPUBLISHING_RULE_FOUND_FOR_REQUEST", "certs", req.getRequestId().toString()));
@@ -1189,7 +1186,7 @@ public class PublisherProcessor implements
         ILdapPublisher publisher = null;
 
         // get mapper and publisher for cert type.
-        Enumeration rules = getRules(PROP_LOCAL_CRL);
+        Enumeration<ILdapRule> rules = getRules(PROP_LOCAL_CRL);
 
         if (rules == null || !rules.hasMoreElements()) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_NO_RULE_FOR_CRL"));
@@ -1279,7 +1276,7 @@ public class PublisherProcessor implements
         if (!enabled())
             return;
             // get mapper and publisher for cert type.
-        Enumeration rules = getRules(PROP_LOCAL_CRL);
+        Enumeration<ILdapRule> rules = getRules(PROP_LOCAL_CRL);
 
         if (rules == null || !rules.hasMoreElements()) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_NO_RULE_FOR_CRL"));
@@ -1364,9 +1361,10 @@ public class PublisherProcessor implements
 
             try {
                 if (dirdn instanceof Vector) {
-                    int n = ((Vector)dirdn).size();
+                    Vector<?> dirdnVector = (Vector<?>)dirdn;
+                    int n = dirdnVector.size();
                     for (int i = 0; i < n; i++) {
-                        publisher.publish(conn, (String)(((Vector)dirdn).elementAt(i)), cert);
+                        publisher.publish(conn, (String)dirdnVector.elementAt(i), cert);
                     }
                 } else if (dirdn instanceof String || 
                            publisher instanceof com.netscape.cms.publish.publishers.FileBasedPublisher) {
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt
index 8894cf22..dffa341b 100644
--- a/pki/base/util/src/CMakeLists.txt
+++ b/pki/base/util/src/CMakeLists.txt
@@ -97,7 +97,6 @@ set(pki-nsutil_java_SRCS
     netscape/security/x509/CertificateValidity.java
     netscape/security/x509/PKIXExtensions.java
     netscape/security/x509/PrintableConverter.java
-    netscape/security/x509/AttributeNameEnumeration.java
     netscape/security/x509/SubjectDirAttributesExtension.java
     netscape/security/x509/CRLDistributionPoint.java
     netscape/security/x509/NameConstraintsExtension.java
@@ -176,7 +175,6 @@ set(pki-nsutil_java_SRCS
     netscape/security/util/ByteArrayTagOrder.java
     netscape/security/util/PrettyPrintResources.java
     netscape/security/util/PrettyPrintFormat.java
-    netscape/security/util/ArraySet.java
     netscape/security/util/CharToByteUniversalString.java
     netscape/security/util/ByteToCharIA5String.java
     netscape/security/util/PubKeyPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index f4a8f3aa..bd0fd7e1 100644
--- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
@@ -28,12 +28,13 @@ import java.text.ParseException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
-import netscape.security.x509.AttributeNameEnumeration;
+
 import netscape.security.x509.CertAttrSet;
 import netscape.security.x509.Extension;
 import netscape.security.x509.OIDMap;
@@ -351,7 +352,7 @@ implements CertAttrSet {
      * attribute.
      */
     public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+        Vector<String> elements = new Vector<String>();
         elements.addElement("octet");
 
 	    return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/pki/base/util/src/netscape/security/util/ArraySet.java
deleted file mode 100644
index 54055789..00000000
--- a/pki/base/util/src/netscape/security/util/ArraySet.java
+++ /dev/null
@@ -1,202 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program 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 for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package netscape.security.util;
-
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * This class implements the Set interface, backed by an ArrayList.  It is
- * designed to offer good performance for very small Sets, especially those
- * that are frequently created and destroyed.  The performance will be
- * <em>extremely</em> bad for large Sets: ArraySet provides linear time
- * performance for the basic operations (add, remove and contains).  This Set
- * permit all elements, including null.
- * <p>
- * <p>
- * <strong>Note that this implementation is not synchronized.</strong> If
- * multiple threads access an ArraySet concurrently, and at least one of the
- * threads modifies the ArraySet, it <em>must</em> be synchronized externally.
- * This is typically accomplished by synchronizing on some object that
- * naturally encapsulates the ArraySet.  If no such object exists, the ArraySet
- * should be "wrapped" using the Collections.synchronizedSet method.  This is
- * best done at creation time, to prevent accidental unsynchronized access to
- * the ArraySet:
- * <pre>
- *	Set s = Collections.synchronizedSet(new ArraySet(...));
- * </pre>
- * <p>
- * The Iterators returned by ArraySet's iterator method are
- * <em>fail-fast</em>: if the HashSet is modified at any time after the
- * Iterator is created, in any way except through the Iterator's own remove
- * method, the Iterator will throw a ConcurrentModificationException.  Thus,
- * in the face of concurrent modification, the Iterator fails quickly and
- * cleanly, rather than risking arbitrary, non-deterministic behavior at an
- * undetermined time in the future.
- *
- * @author  Josh Bloch
- * @version 1.7 10/13/97
- * @see	    Collection
- * @see	    Set
- * @see	    HashSet
- * @see	    ArrayList
- * @since JDK1.2
- */
-
-public class ArraySet extends AbstractSet
-		      implements Set, Cloneable, java.io.Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 3497902530270794207L;
-    private ArrayList a;
-
-    /**
-     * Constructs a new, empty ArraySet; the backing ArrayList has default
-     * initial capacity and capacity increment.
-     *
-     * @since JDK1.2
-     */
-    public ArraySet() {
-	a = new ArrayList();
-    }
-
-    /**
-     * Constructs a new ArraySet containing the elements in the specified
-     * Collection.  The backing ArrayList has default initial capacity and
-     * capacity increment. 
-     *
-     * @exception  NullPointerException the specified collection is null.
-     * @since JDK1.2
-     */
-    public ArraySet(Collection c) {
-	a = new ArrayList();
-
-	// Add elements of c to a.  Don't check for dups if c is a Set.
-	Iterator i = c.iterator();
-	if(c instanceof Set) {
-	    while(i.hasNext())
-		a.add(i.next());
-	} else {
-	    while(i.hasNext())
-		add(i.next());
-	}
-    }
-
-    /**
-     * Constructs a new, empty ArraySet; the backing ArrayList has the
-     * specified initial capacity and default capacity increment.
-     *
-     * @param   initialCapacity     the initial capacity of the ArrayList.
-     * @since   JDK1.2
-     */
-    public ArraySet(int initialCapacity) {
-	a = new ArrayList(initialCapacity);
-    }
-
-    /**
-     * Returns an Iterator over the elements in this ArraySet.  The elements
-     * are returned in the order they were added.
-     *
-     * @since JDK1.2
-     */
-    public Iterator iterator() {
-	return a.iterator();
-    }
-
-    /**
-     * Returns the number of elements in this ArraySet (its cardinality).
-     *
-     * @since JDK1.2
-     */
-    public int size() {
-	return a.size();
-    }
-
-    /**
-     * Returns true if this ArraySet contains no elements.
-     *
-     * @since JDK1.2
-     */
-    public boolean isEmpty() {
-	return a.size()==0;
-    }
-
-    /**
-     * Returns true if this ArraySet contains the specified element.
-     *
-     * @since JDK1.2
-     */
-    public boolean contains(Object o) {
-	return a.contains(o);
-    }
-
-    /**
-     * Adds the specified element to this Set if it is not already present.
-     *
-     * @param o element to be added to this Set.
-     * @return true if the Set did not already contain the specified element.
-     * @since JDK1.2
-     */
-    public boolean add(Object o) {
-	boolean modified;
-	if (modified = !a.contains(o))
-	    a.add(o);
-	return modified;
-    }
-
-    /**
-     * Removes the given element from this Set if it is present.
-     *
-     * @param o object to be removed from this Set, if present.
-     * @return true if the Set contained the specified element.
-     * @since JDK1.2
-     */
-    public boolean remove(Object o) {
-	return a.remove(o);
-    }
-
-    /**
-     * Removes all of the elements from this Set.
-     *
-     * @since JDK1.2
-     */
-    public void clear() {
-	a.clear();
-    }
-
-    /**
-     * Returns a shallow copy of this ArraySet. (The elements themselves
-     * are not cloned.)
-     *
-     * @since   JDK1.2
-     */
-    public Object clone() {
-	try { 
-	    ArraySet newSet = (ArraySet)super.clone();
-	    newSet.a = (ArrayList)a.clone();
-	    return newSet;
-	} catch (CloneNotSupportedException e) { 
-	    throw new InternalError();
-	}
-    }
-}
diff --git a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java b/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
deleted file mode 100644
index 47e18fdc..00000000
--- a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program 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 for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package netscape.security.x509;
-
-import java.util.Vector;
-
-/**
- * <p>This class provides the Enumeration implementation used
- * by all the X509 certificate attributes to return the attribute
- * names contained within them.
- *
- * @author Amit Kapoor
- * @author Hemma Prafullchandra
- * @version 1.3
- */
-public class AttributeNameEnumeration extends Vector {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 6855308073169292869L;
-
-    /**
-     * The default constructor for this class.
-     */
-    public AttributeNameEnumeration() {
-        super(1,1);
-    }
-}
diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
index 738c97e4..c0eff9b3 100644
--- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
+++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -320,8 +321,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(KEY_ID);
         elements.addElement(AUTH_NAME);
         elements.addElement(SERIAL_NUMBER);
diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
index f0e689e5..7314c2ac 100644
--- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerOutputStream;
@@ -276,8 +277,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(IS_CA);
         elements.addElement(PATH_LEN);
 
diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/pki/base/util/src/netscape/security/x509/CRLExtensions.java
index 3b165a59..bba44eab 100755
--- a/pki/base/util/src/netscape/security/x509/CRLExtensions.java
+++ b/pki/base/util/src/netscape/security/x509/CRLExtensions.java
@@ -39,18 +39,18 @@ import netscape.security.util.DerValue;
  * @author Hemma Prafullchandra
  * @version 1.4
  */
-public class CRLExtensions extends Vector {
+public class CRLExtensions extends Vector<Extension> {
 
     /**
      *
      */
     private static final long serialVersionUID = 365767738692986418L;
-    private Hashtable map;
+    private Hashtable<String,Extension> map;
 
     // Parse the encoded extension
     private void parseExtension(Extension ext) throws X509ExtensionException {
         try {
-            Class extClass = OIDMap.getClass(ext.getExtensionId());
+            Class<?> extClass = OIDMap.getClass(ext.getExtensionId());
             if (extClass == null) {   // Unsupported extension
                 if (ext.isCritical()) {
                     throw new IOException("Unsupported CRITICAL extension: "
@@ -61,8 +61,8 @@ public class CRLExtensions extends Vector {
                     return;
                 }
             }
-            Class[] params = { Boolean.class, Object.class };
-            Constructor cons = extClass.getConstructor(params);
+            Class<?>[] params = { Boolean.class, Object.class };
+            Constructor<?> cons = extClass.getConstructor(params);
             byte[] extData = ext.getExtensionValue();
             int extLen = extData.length;
 	    Object value = Array.newInstance(byte.class, extLen);
@@ -73,8 +73,8 @@ public class CRLExtensions extends Vector {
 	    Object[] passed = new Object[] {new Boolean(ext.isCritical()),
                                                         value};
             CertAttrSet crlExt = (CertAttrSet)cons.newInstance(passed);
-	    map.put(crlExt.getName(), crlExt);
-            addElement(crlExt);
+	    map.put(crlExt.getName(), (Extension) crlExt);
+            addElement((Extension) crlExt);
 
         } catch (InvocationTargetException invk) {
 	  throw new X509ExtensionException(
@@ -89,7 +89,7 @@ public class CRLExtensions extends Vector {
      * Default constructor.
      */
     public CRLExtensions() {
-        map = new Hashtable();
+        map = new Hashtable<String, Extension>();
     }
 
     /**
@@ -102,7 +102,7 @@ public class CRLExtensions extends Vector {
     public CRLExtensions(DerInputStream in)
     throws CRLException, X509ExtensionException {
 
-        map = new Hashtable();
+        map = new Hashtable<String, Extension>();
         try {
             DerValue[] exts = in.getSequence(5);
 
@@ -128,7 +128,7 @@ public class CRLExtensions extends Vector {
             DerValue val = new DerValue(in);
             DerInputStream str = val.toDerInputStream();
 
-            map = new Hashtable();
+            map = new Hashtable<String, Extension>();
             DerValue[] exts = str.getSequence(5);
 
             for (int i = 0; i < exts.length; i++) {
@@ -213,7 +213,7 @@ public class CRLExtensions extends Vector {
      *        alias.
      * @exception IOException on errors.
      */  
-    public void set(String alias, Object obj) throws IOException {
+    public void set(String alias, Extension obj) throws IOException {
         map.put(alias, obj);
         addElement(obj);
     }
@@ -222,7 +222,7 @@ public class CRLExtensions extends Vector {
      * Return an enumeration of names of the extensions.
      * @return an enumeration of the names of the extensions in this CRL. 
      */  
-    public Enumeration getElements () {
+    public Enumeration<Extension> getElements () {
         return (map.elements());
     }
 }
diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
index d073d881..67baf106 100755
--- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.math.BigInteger;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerOutputStream;
@@ -209,8 +210,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(NUMBER);
 	return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
index d1386e68..8f10ac6a 100644
--- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -205,8 +206,8 @@ public final class CRLReasonExtension  extends Extension implements CertAttrSet
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(REASON);
 
 	return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
index 20d1c0b6..48fcb454 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
@@ -24,6 +24,7 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -172,8 +173,8 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(ALGORITHM);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java
index f30b3164..1f616d67 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateExtensions.java
@@ -59,7 +59,7 @@ implements CertAttrSet, Serializable {
      */
     public static final String NAME = "extensions";
 
-    private Hashtable map;
+    private Hashtable<String, Object> map;
 
     // Parse the encoded extension
     public void parseExtension(Extension ext) throws IOException {
@@ -89,8 +89,8 @@ implements CertAttrSet, Serializable {
                     value};
             CertAttrSet certExt = (CertAttrSet) cons.newInstance(passed);
             if (certExt != null && certExt.getName() != null) {
-                map.put(certExt.getName(), certExt);
-                addElement(certExt);
+                map.put(certExt.getName(), (Extension) certExt);
+                addElement((Extension) certExt);
             }
         } catch (NoSuchMethodException nosuch) {
             throw new IOException(nosuch.toString());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
index c8585b7d..73d9c1d1 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -230,8 +231,8 @@ public class CertificateIssuerExtension extends Extension
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(CERTIFICATE_ISSUER);
 
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java
index f964a220..22d05d07 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -154,8 +155,8 @@ public class CertificateIssuerName implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(DN_NAME);
 
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
index 10cb4513..687aedb4 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -167,8 +168,8 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(ID);
 
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
index e582a35f..106cc450 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
@@ -227,7 +227,7 @@ implements CertAttrSet {
      * attribute.
      */
     public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+        Vector elements = new Vector();
         elements.addElement(mInfos);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java
index a802a436..eeebb873 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -173,8 +174,8 @@ public class CertificateSerialNumber implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(NUMBER);
  
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java
index 5b09fa59..a4dac169 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java
@@ -24,6 +24,7 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -185,8 +186,8 @@ public class CertificateSubjectName implements CertAttrSet, Serializable {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(DN_NAME);
 
         return(elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
index fa44e252..c214546a 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -167,8 +168,8 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(ID);
   
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/pki/base/util/src/netscape/security/x509/CertificateValidity.java
index fdb03594..e0b26428 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateValidity.java
@@ -27,6 +27,7 @@ import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -245,8 +246,8 @@ public class CertificateValidity implements CertAttrSet, Serializable {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(NOT_BEFORE);
         elements.addElement(NOT_AFTER);
   
diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/pki/base/util/src/netscape/security/x509/CertificateVersion.java
index 36daef86..d35a012e 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateVersion.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerInputStream;
@@ -223,8 +224,8 @@ public class CertificateVersion implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(VERSION);
 
         return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java
index acc1bc04..cf888eea 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateX509Key.java
@@ -24,6 +24,7 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -172,8 +173,8 @@ public class CertificateX509Key implements CertAttrSet, Serializable {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(KEY);
 
         return(elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
index 4f4e11c4..96f7167c 100755
--- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
+++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Array;
 import java.math.BigInteger;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerOutputStream;
@@ -222,8 +223,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(NUMBER);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
index 31806ae1..ee93e4be 100644
--- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
+++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -350,8 +351,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(HOLD_INSTRUCTION);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
index c70eca7a..cb568c7f 100755
--- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
+++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Array;
 import java.security.cert.CertificateException;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -229,8 +230,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(INVALIDITY_DATE);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
index 5f09b353..dd599ca6 100644
--- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
+++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -222,8 +223,8 @@ extends Extension implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(ISSUER_NAME);
 
 	return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
index d6afd54c..1cef0f88 100644
--- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
+++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BitArray;
 import netscape.security.util.DerOutputStream;
@@ -348,8 +349,8 @@ public class IssuingDistributionPointExtension extends Extension
         }
     }
 
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(ISSUING_DISTRIBUTION_POINT);
         return (elements.elements());
 //        return (new Vector()).elements();
diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
index 807388a7..7cef5923 100644
--- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
+++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BitArray;
 import netscape.security.util.DerOutputStream;
@@ -385,8 +386,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(DIGITAL_SIGNATURE);
         elements.addElement(NON_REPUDIATION);
         elements.addElement(KEY_ENCIPHERMENT);
diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
index 4a8e91c9..040126bf 100644
--- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
+++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
@@ -213,7 +213,7 @@ implements CertAttrSet {
      * attribute.
      */
     public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+        Vector elements = new Vector();
         elements.addElement(mInfos);
         return (elements.elements());
     }
diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
index 5e54c2d9..9a2ac91c 100644
--- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -300,8 +301,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(PERMITTED_SUBTREES);
         elements.addElement(EXCLUDED_SUBTREES);
 
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
index 45039df8..681d449b 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BigInt;
 import netscape.security.util.DerInputStream;
@@ -274,8 +275,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(REQUIRE);
         elements.addElement(INHIBIT);
 
diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
index 77753711..90dd5267 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
@@ -231,8 +231,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(MAP);
 
 	return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
index c844eb33..30944495 100644
--- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
@@ -27,6 +27,7 @@ import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateParsingException;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -320,8 +321,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
 	elements.addElement(NOT_BEFORE);
 	elements.addElement(NOT_AFTER);
 	
diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/pki/base/util/src/netscape/security/x509/ReasonFlags.java
index 64c8ff90..809323ad 100755
--- a/pki/base/util/src/netscape/security/x509/ReasonFlags.java
+++ b/pki/base/util/src/netscape/security/x509/ReasonFlags.java
@@ -19,6 +19,7 @@ package netscape.security.x509;
 
 import java.io.IOException;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.BitArray;
 import netscape.security.util.DerInputStream;
@@ -266,8 +267,8 @@ public class ReasonFlags {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(UNUSED);
         elements.addElement(KEY_COMPROMISE);
         elements.addElement(CA_COMPROMISE);
diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java
index 5d9d0491..99bd1665 100755
--- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java
+++ b/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java
@@ -27,8 +27,8 @@ import java.security.cert.CRLException;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Set;
+import java.util.TreeSet;
 
-import netscape.security.util.ArraySet;
 import netscape.security.util.BigInt;
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -294,7 +294,7 @@ public class RevokedCertImpl extends RevokedCertificate
     public Set getCriticalExtensionOIDs() {
         if (extensions == null)
             return null;
-        ArraySet extSet = new ArraySet();
+        Set extSet = new TreeSet();
         Extension ex;
             for (Enumeration e = extensions.getElements();
                                           e.hasMoreElements();) {
@@ -315,7 +315,7 @@ public class RevokedCertImpl extends RevokedCertificate
     public Set getNonCriticalExtensionOIDs() {
         if (extensions == null)
             return null;
-        ArraySet extSet = new ArraySet();
+        Set extSet = new TreeSet();
         Extension ex;
             for (Enumeration e = extensions.getElements();
                                           e.hasMoreElements();) {
diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
index f950f57d..5c3ad35e 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -221,8 +222,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(SUBJECT_NAME);
 
 	return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
index a3277ce7..da9170f3 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
@@ -263,8 +263,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
 	return (elements.elements());
     }
 
diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
index 1572f63b..fc65ec31 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Enumeration;
+import java.util.Vector;
 
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
@@ -202,8 +203,8 @@ implements CertAttrSet {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements () {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements () {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(KEY_ID);
 
 	return (elements.elements());
diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java
index 82ec7841..c76e8e25 100755
--- a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java
+++ b/pki/base/util/src/netscape/security/x509/X509CRLImpl.java
@@ -34,13 +34,12 @@ import java.security.cert.Certificate;
 import java.security.cert.X509CRL;
 import java.security.cert.X509CRLEntry;
 import java.security.cert.X509Certificate;
-import java.util.Collection;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Set;
+import java.util.TreeSet;
 
-import netscape.security.util.ArraySet;
 import netscape.security.util.BigInt;
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -103,7 +102,7 @@ public class X509CRLImpl extends X509CRL {
     private Date             thisUpdate = null;
     private Date             nextUpdate = null;
 //    private static final Hashtable revokedCerts = new Hashtable();
-    private Hashtable revokedCerts = new Hashtable();
+    private Hashtable<BigInteger,RevokedCertificate> revokedCerts = new Hashtable<BigInteger, RevokedCertificate>();
 //    private static CRLExtensions    extensions = null;
     private CRLExtensions    extensions = null;
     private boolean entriesIncluded = true;
@@ -281,7 +280,7 @@ public class X509CRLImpl extends X509CRL {
      */
     public X509CRLImpl(X500Name issuer, AlgorithmId algId,
                        Date thisDate, Date nextDate,
-                       Hashtable badCerts, CRLExtensions crlExts)
+                       Hashtable<BigInteger,RevokedCertificate> badCerts, CRLExtensions crlExts)
     throws CRLException, X509ExtensionException {
         this.issuer = issuer;
         this.thisUpdate = thisDate;
@@ -354,7 +353,7 @@ public class X509CRLImpl extends X509CRL {
                 tmp.putUTCTime(nextUpdate);
 
             if (! revokedCerts.isEmpty()) {
-                for (Enumeration e = revokedCerts.elements();
+                for (Enumeration<RevokedCertificate> e = revokedCerts.elements();
                                              e.hasMoreElements();)
                     ((RevokedCertImpl)e.nextElement()).encode(rCerts);
                 tmp.write(DerValue.tag_Sequence, rCerts);
@@ -538,7 +537,7 @@ public class X509CRLImpl extends X509CRL {
             sb.append("\nNO certificates have been revoked\n");
         else {
             sb.append("\nRevoked Certificates:\n");
-            for (Enumeration e = revokedCerts.elements();
+            for (Enumeration<RevokedCertificate> e = revokedCerts.elements();
                                              e.hasMoreElements();)
                 sb.append(((RevokedCertificate)e.nextElement()).toString());
         }
@@ -671,24 +670,22 @@ public class X509CRLImpl extends X509CRL {
      * none.
      * @see RevokedCertificate
      */
-    public Set getRevokedCertificates() {
+    public Set<RevokedCertificate> getRevokedCertificates() {
         if (revokedCerts == null || revokedCerts.isEmpty())
             return null;
         else {
-            ArraySet certSet = new ArraySet();
-            Collection badCerts = revokedCerts.values();
-            Object[] objs = badCerts.toArray();
-            for (int i = 0; i < objs.length; i++)
-                certSet.add(objs[i]);
+            Set<RevokedCertificate> certSet = new TreeSet<RevokedCertificate>(revokedCerts.values());
             return certSet;
         }
     }
 
-    public Hashtable getListOfRevokedCertificates() {
-        if (revokedCerts == null)
+    @SuppressWarnings("unchecked")
+    public Hashtable<BigInteger,RevokedCertificate> getListOfRevokedCertificates() {
+        if (revokedCerts == null){
             return null;
-        else
-            return (Hashtable)revokedCerts.clone();
+        }else{
+            return (Hashtable<BigInteger,RevokedCertificate>)revokedCerts.clone();
+        }
     }
 
     public int getNumberOfRevokedCertificates() {
@@ -808,17 +805,18 @@ public class X509CRLImpl extends X509CRL {
      * @return a set of the extension oid strings in the
      * CRL that are marked critical.
      */
-    public Set getCriticalExtensionOIDs() {
+    public Set<String> getCriticalExtensionOIDs() {
         if (extensions == null)
             return null;
-        ArraySet extSet = new ArraySet();
+        Set<String> extSet = new TreeSet<String>();
         Extension ex;
-            for (Enumeration e = extensions.getElements();
+        for (Enumeration<Extension> e = extensions.getElements();
                                              e.hasMoreElements();) {
-            ex = (Extension)e.nextElement();
-                if (ex.isCritical())
-                extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString());
+        	ex = e.nextElement();
+        	if (ex.isCritical()){
+        		extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString());
             }
+        }
         return extSet;
     }
 
@@ -829,14 +827,14 @@ public class X509CRLImpl extends X509CRL {
      * @return a set of the extension oid strings in the
      * CRL that are NOT marked critical.
      */
-    public Set getNonCriticalExtensionOIDs() {
+    public Set<String> getNonCriticalExtensionOIDs() {
         if (extensions == null)
             return null;
-        ArraySet extSet = new ArraySet();
+        Set<String> extSet = new TreeSet<String>();
         Extension ex;
-            for (Enumeration e = extensions.getElements();
+            for (Enumeration<Extension> e = extensions.getElements();
                                              e.hasMoreElements();) {
-            ex = (Extension)e.nextElement();
+            ex = e.nextElement();
                 if ( ! ex.isCritical())
                 extSet.add(((ObjectIdentifier)ex.getExtensionId()).toString());
             }
@@ -865,9 +863,9 @@ public class X509CRLImpl extends X509CRL {
                 ObjectIdentifier findOID = new ObjectIdentifier(oid);
                 Extension ex = null;
                 ObjectIdentifier inCertOID;
-                for (Enumeration e=extensions.getElements();
+                for (Enumeration<Extension> e=extensions.getElements();
                                                  e.hasMoreElements();) {
-                    ex = (Extension)e.nextElement();
+                    ex = e.nextElement();
                     inCertOID = ex.getExtensionId();
                     if (inCertOID.equals(findOID)) {
                         crlExt = ex;
@@ -894,7 +892,7 @@ public class X509CRLImpl extends X509CRL {
         CRLExtensions exts = getExtensions();
         if (exts == null)
            return null;
-        Enumeration e = exts.getElements();
+        Enumeration<Extension> e = exts.getElements();
         while (e.hasMoreElements()) {
            Extension ext = (Extension)e.nextElement();
            if (ext instanceof CRLNumberExtension) {
@@ -912,7 +910,7 @@ public class X509CRLImpl extends X509CRL {
             CRLExtensions exts = getExtensions();
             if (exts == null)
                 return null;
-            Enumeration e = exts.getElements();
+            Enumeration<Extension> e = exts.getElements();
             while (e.hasMoreElements()) {
                 Extension ext = (Extension)e.nextElement();
                 if (ext instanceof DeltaCRLIndicatorExtension) {
@@ -930,7 +928,7 @@ public class X509CRLImpl extends X509CRL {
             CRLExtensions exts = getExtensions();
             if (exts == null)
                 return false;
-            Enumeration e = exts.getElements();
+            Enumeration<Extension> e = exts.getElements();
             while (e.hasMoreElements()) {
                 Extension ext = (Extension)e.nextElement();
                 if (ext instanceof DeltaCRLIndicatorExtension) {
diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/pki/base/util/src/netscape/security/x509/X509CertImpl.java
index 0d666ebd..bb1b441a 100755
--- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java
+++ b/pki/base/util/src/netscape/security/x509/X509CertImpl.java
@@ -42,8 +42,9 @@ import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Set;
+import java.util.TreeSet;
+import java.util.Vector;
 
-import netscape.security.util.ArraySet;
 import netscape.security.util.BigInt;
 import netscape.security.util.DerEncoder;
 import netscape.security.util.DerOutputStream;
@@ -618,8 +619,8 @@ implements Serializable, DerEncoder {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(NAME + DOT + INFO);
         elements.addElement(NAME + DOT + ALG_ID);
         elements.addElement(NAME + DOT + SIGNATURE);
@@ -912,7 +913,7 @@ implements Serializable, DerEncoder {
                                              CertificateExtensions.NAME);
                 if (exts == null)
                 return null;
-            ArraySet extSet = new ArraySet();
+            Set<String> extSet = new TreeSet();
             Extension ex;
                 for (Enumeration e = exts.getElements(); e.hasMoreElements(); ) {
                 ex = (Extension)e.nextElement();
@@ -941,7 +942,7 @@ implements Serializable, DerEncoder {
                 if (exts == null)
                 return null;
 
-            ArraySet extSet = new ArraySet();
+            Set extSet = new TreeSet();
             Extension ex;
                 for (Enumeration e = exts.getElements(); e.hasMoreElements(); ) {
                 ex = (Extension)e.nextElement();
diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/pki/base/util/src/netscape/security/x509/X509CertInfo.java
index 0e58a10b..4ece0df8 100644
--- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java
+++ b/pki/base/util/src/netscape/security/x509/X509CertInfo.java
@@ -28,6 +28,7 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateParsingException;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Vector;
 
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
@@ -116,7 +117,7 @@ public class X509CertInfo implements CertAttrSet, Serializable {
     private byte[]	rawCertInfo = null;
   
     // The certificate attribute name to integer mapping stored here
-    private static final Hashtable map = new Hashtable();
+    private static final Hashtable<String, Integer> map = new Hashtable<String, Integer>();
     static {
         map.put(VERSION, Integer.valueOf(ATTR_VERSION));
         map.put(SERIAL_NUMBER, Integer.valueOf(ATTR_SERIAL));
@@ -221,8 +222,8 @@ public class X509CertInfo implements CertAttrSet, Serializable {
      * Return an enumeration of names of attributes existing within this
      * attribute.
      */
-    public Enumeration getElements() {
-        AttributeNameEnumeration elements = new AttributeNameEnumeration();
+    public Enumeration<String> getElements() {
+        Vector<String> elements = new Vector<String>();
         elements.addElement(VERSION);
         elements.addElement(SERIAL_NUMBER);
         elements.addElement(ALGORITHM_ID);
@@ -806,7 +807,7 @@ public class X509CertInfo implements CertAttrSet, Serializable {
      * Returns the integer attribute number for the passed attribute name.
      */
     private int attributeMap(String name) {
-        Integer num = (Integer)map.get(name);
+        Integer num = map.get(name);
         if (num == null) {
             return(0);
         }