compatibility updates.

Author: dghgit

ant/bc+-build.xml

@@ -158,6 +158,7 @@
                     srcdir="${artifacts.dir}/@{target}/src"
                     destdir="${build.dir}/@{target}/classes"
                     memoryMaximumSize="512m"
+                    fork="true"
                     debug="${release.debug}">
                     <classpath>
                         <path refid="project.classpath" /> 

ant/jdk14.xml

@@ -155,6 +155,8 @@
                 <exclude name="**/jsse/**"/>
                 <exclude name="**/CertChainUtil.java"/>
                 <exclude name="**/TlsTestUtils.java"/>
+                <exclude name="**/TlsServerRawKeysTest.java"/>
+                <exclude name="**/TlsClientRawKeysTest.java"/>
             </fileset>
 
             <fileset dir="tls/src/test/resources" includes="**/*.*"/>

tls/src/test/java/org/bouncycastle/tls/test/MockRawKeysTlsClient.java

@@ -4,6 +4,7 @@
 import java.security.SecureRandom;
 import java.util.Vector;
 
+import junit.framework.TestCase;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
 import org.bouncycastle.tls.Certificate;
@@ -22,13 +23,12 @@
 import org.bouncycastle.tls.TlsServerCertificate;
 import org.bouncycastle.tls.TlsUtils;
 import org.bouncycastle.tls.crypto.TlsCertificate;
+import org.bouncycastle.tls.crypto.TlsCrypto;
 import org.bouncycastle.tls.crypto.TlsCryptoParameters;
 import org.bouncycastle.tls.crypto.impl.bc.BcDefaultTlsCredentialedSigner;
 import org.bouncycastle.tls.crypto.impl.bc.BcTlsCrypto;
 import org.bouncycastle.tls.crypto.impl.bc.BcTlsRawKeyCertificate;
 
-import junit.framework.TestCase;
-
 class MockRawKeysTlsClient
     extends DefaultTlsClient
 {
@@ -114,15 +114,15 @@ public TlsCredentials getClientCredentials(CertificateRequest certificateRequest
                         break;
                     case CertificateType.RawPublicKey:
                         TlsCertificate rawKeyCert = new BcTlsRawKeyCertificate(
-                                getCrypto(),
+                            (BcTlsCrypto)getCrypto(),
                                 SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(privateKey.generatePublicKey()));
                         Certificate cert = new Certificate(
                                 CertificateType.RawPublicKey,
                                 TlsUtils.isTLSv13(context) ? TlsUtils.EMPTY_BYTES : null,
                                 new CertificateEntry[] {new CertificateEntry(rawKeyCert, null)});
                         credentials = new BcDefaultTlsCredentialedSigner(
                                 new TlsCryptoParameters(context),
-                                getCrypto(),
+                            (BcTlsCrypto)getCrypto(),
                                 privateKey,
                                 cert,
                                 SignatureAndHashAlgorithm.ed25519);
@@ -137,8 +137,8 @@ public TlsCredentials getClientCredentials(CertificateRequest certificateRequest
         };
     }
 
-    public BcTlsCrypto getCrypto()
+    public TlsCrypto getCrypto()
     {
-        return (BcTlsCrypto) super.getCrypto();
+        return super.getCrypto();
     }
 }

tls/src/test/java/org/bouncycastle/tls/test/MockRawKeysTlsServer.java

@@ -5,6 +5,7 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
+import junit.framework.TestCase;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
 import org.bouncycastle.tls.Certificate;
@@ -21,13 +22,12 @@
 import org.bouncycastle.tls.TlsCredentials;
 import org.bouncycastle.tls.TlsUtils;
 import org.bouncycastle.tls.crypto.TlsCertificate;
+import org.bouncycastle.tls.crypto.TlsCrypto;
 import org.bouncycastle.tls.crypto.TlsCryptoParameters;
 import org.bouncycastle.tls.crypto.impl.bc.BcDefaultTlsCredentialedSigner;
 import org.bouncycastle.tls.crypto.impl.bc.BcTlsCrypto;
 import org.bouncycastle.tls.crypto.impl.bc.BcTlsRawKeyCertificate;
 
-import junit.framework.TestCase;
-
 class MockRawKeysTlsServer extends DefaultTlsServer
 {
 
@@ -97,15 +97,15 @@ protected TlsCredentialedSigner getECDSASignerCredentials() throws IOException
                 break;
             case CertificateType.RawPublicKey:
                 TlsCertificate rawKeyCert = new BcTlsRawKeyCertificate(
-                        getCrypto(),
+                    (BcTlsCrypto)getCrypto(),
                         SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(privateKey.generatePublicKey()));
                 Certificate cert = new Certificate(
                         CertificateType.RawPublicKey,
                         TlsUtils.isTLSv13(context) ? TlsUtils.EMPTY_BYTES : null,
                         new CertificateEntry[] {new CertificateEntry(rawKeyCert, null)});
                 credentials = new BcDefaultTlsCredentialedSigner(
                         new TlsCryptoParameters(context),
-                        getCrypto(),
+                    (BcTlsCrypto)getCrypto(),
                         privateKey,
                         cert,
                         SignatureAndHashAlgorithm.ed25519);
@@ -158,8 +158,8 @@ public void notifyClientCertificate(Certificate clientCertificate) throws IOExce
         TestCase.assertEquals("client certificate is the wrong type", clientCertType, clientCertificate.getCertificateType());
     }
 
-    public BcTlsCrypto getCrypto()
+    public TlsCrypto getCrypto()
     {
-        return (BcTlsCrypto) super.getCrypto();
+        return super.getCrypto();
     }
 }

tls/src/test/java/org/bouncycastle/tls/test/TlsServerRawKeysTest.java

@@ -31,8 +31,9 @@ public static void main(String[] args)
         ServerSocket ss = new ServerSocket(port, 16, address);
         try
         {
-            for (ProtocolVersion tlsVersion : tlsVersions)
+            for (int i = 0; i != tlsVersions.length; i++)
             {
+                ProtocolVersion tlsVersion = tlsVersions[i];
                 Socket s = ss.accept();
                 System.out.println("--------------------------------------------------------------------------------");
                 System.out.println("Accepted " + s);