Java 5 updates.

Author: dghgit

pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPV6KeyGenerator.java

@@ -1,5 +1,10 @@
 package org.bouncycastle.openpgp.api;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.bouncycastle.bcpg.AEADAlgorithmTags;
 import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.bouncycastle.bcpg.HashAlgorithmTags;
@@ -29,11 +34,6 @@
 import org.bouncycastle.openpgp.operator.PGPKeyPairGeneratorProvider;
 import org.bouncycastle.util.Arrays;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * High-level generator class for OpenPGP v6 keys.
  */
@@ -521,7 +521,7 @@ public WithPrimaryKey withPrimaryKey(
      * @throws PGPException if the key cannot be generated
      */
     public WithPrimaryKey withPrimaryKey(
-        PGPKeyPair primaryKeyPair,
+        final PGPKeyPair primaryKeyPair,
         SignatureSubpacketsFunction directKeySubpackets,
         PBESecretKeyEncryptor keyEncryptor)
         throws PGPException

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JceAEADUtil.java

@@ -4,12 +4,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
@@ -297,8 +293,7 @@ static byte[] processAeadKeyData(JceAEADUtil aeadUtil, int mode, int encAlgorith
             JceAEADCipherUtil.setUpAeadCipher(c, secretKey, mode, iv, 128, aad);
             return c.doFinal(keyData, keyOff, keyLen);
         }
-        catch (InvalidAlgorithmParameterException | InvalidKeyException |
-               IllegalBlockSizeException | BadPaddingException e)
+        catch (GeneralSecurityException e)
         {
             throw new PGPException("Exception recovering AEAD protected private key material", e);
         }

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyKeyEncryptionMethodGenerator.java

@@ -104,7 +104,7 @@ protected byte[] encryptSessionInfo(PGPPublicKey pubKey,
             if (pubKey.getAlgorithm() == PublicKeyAlgorithmTags.ECDH)
             {
                 byte[] sessionInfo = createSessionInfo(isV3 ? optSymAlgId : (byte)0, sessionKey);
-                ECDHPublicBCPGKey ecKey = (ECDHPublicBCPGKey)pubKey.getPublicKeyPacket().getKey();
+                final ECDHPublicBCPGKey ecKey = (ECDHPublicBCPGKey)pubKey.getPublicKeyPacket().getKey();
                 String keyEncryptionOID = RFC6637Utils.getKeyEncryptionOID(ecKey.getSymmetricKeyAlgorithm()).getId();
                 PublicKeyPacket pubKeyPacket = pubKey.getPublicKeyPacket();