Java 4 compatibility updates.

Removed Camellia wrap enable property from OpenPGP (not required).

Author: dghgit

ant/build.regexp

@@ -1,3 +1,3 @@
 
-regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated
+regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated|@FunctionalInterface
 

ant/jdk14.xml

@@ -41,6 +41,10 @@
             <fileset dir="pg/src/main/java">
                 <exclude name="**/keybox/**/*.java"/>
             </fileset>
+            <fileset dir="pg/src/main/jdk1.5">
+                <exclude name="**/keybox/**/*.java"/>
+                <include name="**/*.java"/>
+            </fileset>
             <fileset dir="pkix/src/main/java">
                 <exclude name="**/JceAADStream.java"/>
                 <exclude name="**/JceKeyTransAuthEnvelopedRecipient.java"/>
@@ -76,6 +80,7 @@
                 <exclude name="**/PKCS12StoreParameter.java"/>
                 <exclude name="**/JDKPKCS12StoreParameter.java"/>
                 <exclude name="**/SIKE*.java"/>
+                <exclude name="**/CompositeSign*.java"/>
                 <exclude name="**/rainbow/*.java"/>
                 <exclude name="**/Rainbow*.java"/>
                 <exclude name="**/XMS*.java"/>
@@ -84,6 +89,7 @@
                 <exclude name="**/legacy/**/ntru/**/*.java"/>
                 <exclude name="**/xmss/**/*.java"/>
                 <exclude name="**/lms/**/*.java"/>
+                <exclude name="**/asymmetric/compositesignatures/*.java"/>
                 <exclude name="**/asymmetric/DSTU*.java"/>
                 <exclude name="**/asymmetric/dstu/*.java"/>
                 <exclude name="**/asymmetric/ecgost12/*.java"/>

core/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java

@@ -151,7 +151,7 @@ public String getEntry(String key,Locale loc, TimeZone timezone) throws MissingE
             String result = bundle.getString(entry);
             if (!encoding.equals(DEFAULT_ENCODING))
             {
-                result = new String(result.getBytes(Charset.forName(DEFAULT_ENCODING)), encoding);
+                result = new String(result.getBytes(DEFAULT_ENCODING), encoding);
             }
             if (!arguments.isEmpty())
             {

core/src/main/java/org/bouncycastle/util/test/SimpleTest.java

@@ -284,9 +284,9 @@ protected Exception testException(String failMessage, String exceptionClass, Tes
         {
             if (failMessage != null)
             {
-                isTrue(e.getMessage(), e.getMessage().contains(failMessage));
+                isTrue(e.getMessage(), e.getMessage().indexOf(failMessage) >= 0);
             }
-            isTrue(e.getClass().getName().contains(exceptionClass));
+            isTrue(e.getClass().getName().indexOf(exceptionClass) >= 0);
             return e;
         }
         return null;