cleanup/compatibility changes

Author: dghgit

pg/src/test/java/org/bouncycastle/openpgp/test/IgnoreUnknownEncryptedSessionKeys.java

@@ -244,8 +244,9 @@ private void attemptDecryption(String msg)
         isTrue(encryptedDataList != null);
 
         InputStream decryptIn = null;
-        for (PGPEncryptedData encryptedData : encryptedDataList)
+        for (int i = 0; i != encryptedDataList.size(); i++)
         {
+            PGPEncryptedData encryptedData = encryptedDataList.get(i);
             if (encryptedData instanceof PGPPublicKeyEncryptedData)
             {
                 PGPPublicKeyEncryptedData pkesk = (PGPPublicKeyEncryptedData)encryptedData;

pg/src/test/java/org/bouncycastle/openpgp/test/UnrecognizableSubkeyParserTest.java

@@ -505,7 +505,7 @@ public void subkeyHasEcdhUnknownCurveOpaqueEncodingSmall()
         isTrue("BC must be able to deal with ECDH subkeys with unknown curves", cert != null);
     }
 
-    private int count(Iterator<?> iterator)
+    private int count(Iterator iterator)
     {
         int i = 0;
         while (iterator.hasNext())