compatibility updates.

4 files changed, 11 insertions, 8 deletions

diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java
index afa56362..a6fb8099 100644
--- a/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java
+++ b/pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java
@@ -59,12 +59,11 @@ public class PGPOnePassSignature
         initVerify(pubKey, PGPUtil.getProvider(provider));
     }
 
-        /**
+    /**
      * Initialise the signature object for verification.
      *
      * @param pubKey
      * @param provider
-     * @throws NoSuchProviderException
      * @throws PGPException
      * @deprecated use init() method.
      */
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java
index 2bb0d96d..b7b697ec 100644
--- a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java
+++ b/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java
@@ -1,8 +1,8 @@
 package org.bouncycastle.openpgp.operator.jcajce;
 
-import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.Key;
+import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.Provider;
 
@@ -164,7 +164,11 @@ public class JcePublicKeyDataDecryptorFactoryBuilder
 
             return PGPUtil.unpadSessionData(paddedSessionKey.getEncoded());
         }
-        catch (GeneralSecurityException e)
+        catch (InvalidKeyException e)
+        {
+            throw new PGPException("error setting asymmetric cipher", e);
+        }
+        catch (NoSuchAlgorithmException e)
         {
             throw new PGPException("error setting asymmetric cipher", e);
         }
diff --git a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java b/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java
index 17978ef3..e8124318 100644
--- a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java
+++ b/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDHTest.java
@@ -90,7 +90,7 @@ public class PGPECDHTest
         //
         KeyPairGenerator        keyGen = KeyPairGenerator.getInstance("ECDSA", "BC");
 
-        keyGen.initialize(new ECGenParameterSpec("P-256"));
+        keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256"));
 
         KeyPair kpSign = keyGen.generateKeyPair();
 
@@ -101,7 +101,7 @@ public class PGPECDHTest
         //
         keyGen = KeyPairGenerator.getInstance("ECDH", "BC");
 
-        keyGen.initialize(new ECGenParameterSpec("P-256"));
+        keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256"));
 
         KeyPair kpEnc = keyGen.generateKeyPair();
 
@@ -181,7 +181,7 @@ public class PGPECDHTest
 
         KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDH", "BC");
 
-        keyGen.initialize(new ECGenParameterSpec("P-256"));
+        keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256"));
 
         KeyPair kpEnc = keyGen.generateKeyPair();
 
diff --git a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java b/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java
index 83fd6528..71826e5d 100644
--- a/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java
+++ b/pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/PGPECDSATest.java
@@ -58,7 +58,7 @@ public class PGPECDSATest
     {
         KeyPairGenerator        keyGen = KeyPairGenerator.getInstance("ECDSA", "BC");
 
-        keyGen.initialize(new ECGenParameterSpec("P-256"));
+        keyGen.initialize(new ECNamedCurveGenParameterSpec("P-256"));
 
         KeyPair kpSign = keyGen.generateKeyPair();