removed some unnecessary dependencies on the BC EC interfaces.

dghgit · dghgit · commit 1246bd626439 · 2015-02-01T13:05:38.000+11:00
diff --git a/bc-build.properties b/bc-build.properties
@@ -1,9 +1,11 @@
 
-release.suffix: 152b01
-release.name: 1.52b01
-release.version: 1.52.0.1
-release.debug: false
+release.suffix: 152b06
+release.name: 1.52b06
+release.version: 1.52.0.6
+release.debug: true
 
 mail.jar.home: /opt/javamail/mail.jar
 activation.jar.home: /opt/jaf/activation.jar
+#junit.jar.home: /opt/junit4.8.1/junit-4.8.1.jar
 junit.jar.home: /opt/junit/junit.jar
+
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java
@@ -43,8 +43,6 @@
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
 import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;
 import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
 import org.bouncycastle.jce.interfaces.IESKey;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.IESParameterSpec;
@@ -284,7 +282,7 @@ else if (nonce.length != ivLength)
         // Parse the recipient's key
         if (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE)
         {
-            if (key instanceof ECPublicKey)
+            if (key instanceof PublicKey)
             {
                 this.key = ECUtil.generatePublicKeyParameter((PublicKey)key);
             }
@@ -302,7 +300,7 @@ else if (key instanceof IESKey)
         }
         else if (opmode == Cipher.DECRYPT_MODE || opmode == Cipher.UNWRAP_MODE)
         {
-            if (key instanceof ECPrivateKey)
+            if (key instanceof PrivateKey)
             {
                 this.key = ECUtil.generatePrivateKeyParameter((PrivateKey)key);
             }
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
@@ -58,14 +58,7 @@ else if (publicKey instanceof GOST3410Key)
 
                 publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
 
-                if (publicKey instanceof ECPublicKey)
-                {
-                    param = ECUtil.generatePublicKeyParameter(publicKey);
-                }
-                else
-                {
-                    throw new InvalidKeyException("can't recognise key type in DSA based signer");
-                }
+                param = ECUtil.generatePublicKeyParameter(publicKey);
             }
             catch (Exception e)
             {
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
@@ -13,6 +13,7 @@
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.interfaces.DHPrivateKey;
+import javax.crypto.interfaces.DHPublicKey;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.InvalidCipherTextException;
@@ -183,15 +184,16 @@ else if (!(params instanceof IESParameterSpec))
         CipherParameters pubKey;
         CipherParameters privKey;
 
-        if (ieKey.getPublic() instanceof ECPublicKey)
+        if (ieKey.getPublic() instanceof DHPublicKey)
         {
-            pubKey = ECUtil.generatePublicKeyParameter(ieKey.getPublic());
-            privKey = ECUtil.generatePrivateKeyParameter(ieKey.getPrivate());
+            pubKey = DHUtil.generatePublicKeyParameter(ieKey.getPublic());
+            privKey = DHUtil.generatePrivateKeyParameter(ieKey.getPrivate());
+
         }
         else
         {
-            pubKey = DHUtil.generatePublicKeyParameter(ieKey.getPublic());
-            privKey = DHUtil.generatePrivateKeyParameter(ieKey.getPrivate());
+            pubKey = ECUtil.generatePublicKeyParameter(ieKey.getPublic());
+            privKey = ECUtil.generatePrivateKeyParameter(ieKey.getPrivate());
         }
 
         this.engineParams = (IESParameterSpec)params;
diff --git a/prov/src/main/jdk1.1/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java b/prov/src/main/jdk1.1/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
@@ -61,14 +61,7 @@ else if (publicKey instanceof GOST3410Key)
 
                 publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
 
-                if (publicKey instanceof ECPublicKey)
-                {
-                    param = ECUtil.generatePublicKeyParameter(publicKey);
-                }
-                else
-                {
-                    throw new InvalidKeyException("can't recognise key type in DSA based signer");
-                }
+                param = ECUtil.generatePublicKeyParameter(publicKey);
             }
             catch (Exception e)
             {
diff --git a/prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java b/prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
@@ -86,14 +86,7 @@ protected void doEngineInitSign(
     {
         CipherParameters param;
 
-        if (privateKey instanceof ECKey)
-        {
-            param = ECUtil.generatePrivateKeyParameter(privateKey);
-        }
-        else
-        {
-            throw new InvalidKeyException("can't recognise key type in ECDSA based signer");
-        }
+        param = ECUtil.generatePrivateKeyParameter(privateKey);
 
         digest.reset();
 
diff --git a/prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java b/prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
@@ -59,14 +59,7 @@ else if (publicKey instanceof GOST3410Key)
 
                 publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
 
-                if (publicKey instanceof ECPublicKey)
-                {
-                    param = ECUtil.generatePublicKeyParameter(publicKey);
-                }
-                else
-                {
-                    throw new InvalidKeyException("can't recognise key type in DSA based signer");
-                }
+                param = ECUtil.generatePublicKeyParameter(publicKey);
             }
             catch (Exception e)
             {

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@`
`43`	`43`	`import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;`
`44`	`44`	`import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;`
`45`	`45`	`import org.bouncycastle.jce.interfaces.ECKey;`
`46`		`-import org.bouncycastle.jce.interfaces.ECPrivateKey;`
`47`		`-import org.bouncycastle.jce.interfaces.ECPublicKey;`
`48`	`46`	`import org.bouncycastle.jce.interfaces.IESKey;`
`49`	`47`	`import org.bouncycastle.jce.provider.BouncyCastleProvider;`
`50`	`48`	`import org.bouncycastle.jce.spec.IESParameterSpec;`
`@@ -284,7 +282,7 @@ else if (nonce.length != ivLength)`
`284`	`282`	`// Parse the recipient's key`
`285`	`283`	`if (opmode == Cipher.ENCRYPT_MODE \|\| opmode == Cipher.WRAP_MODE)`
`286`	`284`	`{`
`287`		`- if (key instanceof ECPublicKey)`
	`285`	`+ if (key instanceof PublicKey)`
`288`	`286`	`{`
`289`	`287`	`this.key = ECUtil.generatePublicKeyParameter((PublicKey)key);`
`290`	`288`	`}`
`@@ -302,7 +300,7 @@ else if (key instanceof IESKey)`
`302`	`300`	`}`
`303`	`301`	`else if (opmode == Cipher.DECRYPT_MODE \|\| opmode == Cipher.UNWRAP_MODE)`
`304`	`302`	`{`
`305`		`- if (key instanceof ECPrivateKey)`
	`303`	`+ if (key instanceof PrivateKey)`
`306`	`304`	`{`
`307`	`305`	`this.key = ECUtil.generatePrivateKeyParameter((PrivateKey)key);`
`308`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,7 @@ else if (publicKey instanceof GOST3410Key)`
`58`	`58`
`59`	`59`	`publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));`
`60`	`60`
`61`		`- if (publicKey instanceof ECPublicKey)`
`62`		`- {`
`63`		`- param = ECUtil.generatePublicKeyParameter(publicKey);`
`64`		`- }`
`65`		`- else`
`66`		`- {`
`67`		`- throw new InvalidKeyException("can't recognise key type in DSA based signer");`
`68`		`- }`
	`61`	`+ param = ECUtil.generatePublicKeyParameter(publicKey);`
`69`	`62`	`}`
`70`	`63`	`catch (Exception e)`
`71`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,7 @@ else if (publicKey instanceof GOST3410Key)`
`61`	`61`
`62`	`62`	`publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));`
`63`	`63`
`64`		`- if (publicKey instanceof ECPublicKey)`
`65`		`- {`
`66`		`- param = ECUtil.generatePublicKeyParameter(publicKey);`
`67`		`- }`
`68`		`- else`
`69`		`- {`
`70`		`- throw new InvalidKeyException("can't recognise key type in DSA based signer");`
`71`		`- }`
	`64`	`+ param = ECUtil.generatePublicKeyParameter(publicKey);`
`72`	`65`	`}`
`73`	`66`	`catch (Exception e)`
`74`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,7 @@ else if (publicKey instanceof GOST3410Key)`
`59`	`59`
`60`	`60`	`publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));`
`61`	`61`
`62`		`- if (publicKey instanceof ECPublicKey)`
`63`		`- {`
`64`		`- param = ECUtil.generatePublicKeyParameter(publicKey);`
`65`		`- }`
`66`		`- else`
`67`		`- {`
`68`		`- throw new InvalidKeyException("can't recognise key type in DSA based signer");`
`69`		`- }`
	`62`	`+ param = ECUtil.generatePublicKeyParameter(publicKey);`
`70`	`63`	`}`
`71`	`64`	`catch (Exception e)`
`72`	`65`	`{`