From cd4a3dd2377d64f73da08711007e89c4733f9cef Mon Sep 17 00:00:00 2001
From: Ashley Hughes <spirit.returned@gmail.com>
Date: Tue, 14 Jan 2014 15:48:05 +0000
Subject: [PATCH] begin refactor

---
 .../keychain/pgp/PgpOperation.java            | 54 ++++++++++++++-----
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
index 6f0821fdc..1525c9462 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
@@ -927,20 +927,12 @@ public class PgpOperation {
                     if (tmp_subkeyBinding_isok)
                         subkeyBinding_isok = true;
                     if (tmp_subkeyBinding_isok) {
-                        PGPSignatureSubpacketVector hPkts = sig.getHashedSubPackets();
-                        PGPSignatureSubpacketVector uhPkts = sig.getUnhashedSubPackets();
-                        if (uhPkts.hasSubpacket(SignatureSubpacketTags.EMBEDDED_SIGNATURE)) {
-                            PGPSignatureList eSigList = uhPkts.getEmbeddedSignatures();
-                            for (int j = 0; j < eSigList.size(); ++j) {
-                                PGPSignature emSig = eSigList.get(j);
-                                emSig.init(contentVerifierBuilderProvider, signatureKey);
-                                primkeyBinding_isok = emSig.verifyCertification(mKey, signatureKey);
-                                if (primkeyBinding_isok)
-                                    break;
-                            }
-                        }
-                        if (hPkts.hasSubpacket(SignatureSubpacketTags.EMBEDDED_SIGNATURE)) {
-                        }
+                        primkeyBinding_isok = verifyPrimaryBinding(sig.getUnhashedSubPackets(), mKey, signatureKey);
+                        if (primkeyBinding_isok)
+                            break;
+                        primkeyBinding_isok = verifyPrimaryBinding(sig.getHashedSubPackets(), mKey, signatureKey);
+                        if (primkeyBinding_isok)
+                            break;
                     }
                 }
             }
@@ -954,6 +946,40 @@ public class PgpOperation {
         return returnData;
     }
 
+    private boolean verifyPrimaryBinding(PGPSignatureSubpacketVector Pkts, PGPPublicKey masterPublicKey, PGPPublicKey signingPublicKey)
+    {
+        boolean primkeyBinding_isok = false;
+        JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider()
+                .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME);
+        PGPSignatureList eSigList;
+
+        if (Pkts.hasSubpacket(SignatureSubpacketTags.EMBEDDED_SIGNATURE)) {
+            try {
+				eSigList = Pkts.getEmbeddedSignatures();
+            } catch (IOException e) {
+                return false;
+            } catch (PGPException e) {
+                return false;
+            }
+			for (int j = 0; j < eSigList.size(); ++j) {
+				PGPSignature emSig = eSigList.get(j);
+	            if (emSig.getSignatureType() == PGPSignature.PRIMARYKEY_BINDING) {
+                    try {
+						emSig.init(contentVerifierBuilderProvider, signingPublicKey);
+						primkeyBinding_isok = emSig.verifyCertification(masterPublicKey, signingPublicKey);
+						if (primkeyBinding_isok)
+							break;
+                    } catch (PGPException e) {
+                        continue;
+                    } catch (SignatureException e) {
+                        continue;
+                    }
+	            }
+			}
+        }
+        return primkeyBinding_isok;
+    }
+
     private static void processLine(final String pLine, final ArmoredOutputStream pArmoredOutput,
             final PGPSignatureGenerator pSignatureGenerator) throws IOException, SignatureException {