Adapt KeyIdentifier changes

Author: vanitasvitae

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

@@ -4,24 +4,20 @@
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.BCPGOutputStream;
 import org.bouncycastle.bcpg.FingerprintUtil;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.PacketFormat;
 import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.bouncycastle.bcpg.SignaturePacket;
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
 import org.bouncycastle.bcpg.sig.Features;
 import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.bouncycastle.bcpg.sig.NotationData;
 import org.bouncycastle.bcpg.sig.PreferredAEADCiphersuites;
 import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
 import org.bouncycastle.openpgp.*;
 import org.bouncycastle.openpgp.api.exception.IncorrectPGPSignatureException;
-import org.bouncycastle.openpgp.api.exception.MalformedPGPSignatureException;
 import org.bouncycastle.openpgp.api.exception.MissingIssuerCertException;
 import org.bouncycastle.openpgp.api.util.UTCUtil;
 import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
-import org.bouncycastle.util.Iterable;
-import org.bouncycastle.util.encoders.Hex;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -96,7 +92,7 @@ public OpenPGPCertificate(PGPKeyRing keyRing, OpenPGPImplementation implementati
         {
             PGPPublicKey rawSubkey = rawKeys.next();
             OpenPGPSubkey subkey = new OpenPGPSubkey(rawSubkey, this);
-            subkeys.put(new KeyIdentifier(rawSubkey), subkey);
+            subkeys.put(rawSubkey.getKeyIdentifier(), subkey);
             processSubkey(subkey);
         }
     }
@@ -215,7 +211,7 @@ public List<OpenPGPComponentKey> getKeys()
      */
     public OpenPGPComponentKey getKey(KeyIdentifier identifier)
     {
-        if (identifier.matches(getPrimaryKey().getPGPPublicKey()))
+        if (identifier.matches(getPrimaryKey().getPGPPublicKey().getKeyIdentifier()))
         {
             return primaryKey;
         }
@@ -1028,7 +1024,7 @@ public PGPPublicKey getPGPPublicKey()
          */
         public KeyIdentifier getKeyIdentifier()
         {
-            return new KeyIdentifier(rawPubkey);
+            return rawPubkey.getKeyIdentifier();
         }
 
         /**

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

@@ -3,9 +3,9 @@
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.PacketFormat;
 import org.bouncycastle.bcpg.SecretKeyPacket;
-import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPObjectFactory;
 import org.bouncycastle.openpgp.PGPPrivateKey;

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

@@ -1,6 +1,6 @@
 package org.bouncycastle.openpgp.api;
 
-import org.bouncycastle.openpgp.KeyIdentifier;
+import org.bouncycastle.bcpg.KeyIdentifier;
 
 import java.util.Collection;
 import java.util.HashMap;

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

@@ -1,6 +1,6 @@
 package org.bouncycastle.openpgp.api;
 
-import org.bouncycastle.openpgp.KeyIdentifier;
+import org.bouncycastle.bcpg.KeyIdentifier;
 
 /**
  * Interface for providing OpenPGP keys or certificates.

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

@@ -4,14 +4,14 @@
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.S2K;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
 import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
 import org.bouncycastle.bcpg.sig.Features;
 import org.bouncycastle.bcpg.sig.PreferredAEADCiphersuites;
 import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
-import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPCompressedDataGenerator;
 import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
 import org.bouncycastle.openpgp.PGPException;

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

@@ -3,7 +3,7 @@
 import org.bouncycastle.bcpg.AEADEncDataPacket;
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket;
-import org.bouncycastle.openpgp.KeyIdentifier;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPCompressedData;
 import org.bouncycastle.openpgp.PGPEncryptedDataList;
 import org.bouncycastle.openpgp.PGPException;

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

@@ -1,7 +1,7 @@
 package org.bouncycastle.openpgp.api;
 
 import org.bouncycastle.bcpg.InputStreamPacket;
-import org.bouncycastle.openpgp.KeyIdentifier;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPEncryptedData;
 import org.bouncycastle.openpgp.PGPEncryptedDataList;
 import org.bouncycastle.openpgp.PGPException;

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

@@ -1,10 +1,10 @@
 package org.bouncycastle.openpgp.api;
 
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.SignaturePacket;
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
 import org.bouncycastle.bcpg.sig.NotationData;
-import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPOnePassSignature;
 import org.bouncycastle.openpgp.PGPSignature;

pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java

@@ -2,10 +2,10 @@
 
 import org.bouncycastle.bcpg.ArmoredInputStream;
 import org.bouncycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.sig.Features;
 import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.bouncycastle.bcpg.test.AbstractPacketTest;
-import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.OpenPGPTestKeys;
 import org.bouncycastle.openpgp.PGPObjectFactory;
 import org.bouncycastle.openpgp.PGPSignature;

pg/src/test/java/org/bouncycastle/openpgp/api/test/StaticV6OpenPGPMessageGeneratorTest.java

@@ -1,7 +1,7 @@
 package org.bouncycastle.openpgp.api.test;
 
+import org.bouncycastle.bcpg.KeyIdentifier;
 import org.bouncycastle.bcpg.test.AbstractPacketTest;
-import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.OpenPGPTestKeys;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.api.OpenPGPKey;