Fix NPE when encoding signature without hashed area

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/openpgp/PGPSignature.java

@@ -907,7 +907,10 @@ public void encode(
         throws IOException
     {
         // Exportable signatures MUST NOT be exported if forTransfer==true
-        if (forTransfer && (!getHashedSubPackets().isExportable() || !getUnhashedSubPackets().isExportable()))
+        if (forTransfer &&
+                ((getHashedSubPackets() != null && !getHashedSubPackets().isExportable()) ||
+                (getUnhashedSubPackets() != null && !getUnhashedSubPackets().isExportable()))
+        )
         {
             return;
         }

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

@@ -1015,7 +1015,7 @@ public int compare(OpenPGPSignatureChain o1, OpenPGPSignatureChain o2)
         {
             OpenPGPSignatureChain binding = it.next();
             PGPSignature sig = binding.getSignature().getSignature();
-            if (sig.getHashedSubPackets().isPrimaryUserID())
+            if (sig.getHashedSubPackets() != null && sig.getHashedSubPackets().isPrimaryUserID())
             {
                 return binding;
             }
@@ -1830,6 +1830,11 @@ private void verifyEmbeddedPrimaryKeyBinding(PGPContentVerifierBuilderProvider c
                                                      OpenPGPPolicy policy, Date signatureCreationTime)
             throws PGPSignatureException
         {
+            if (signature.getHashedSubPackets() == null)
+            {
+                return;
+            }
+
             int keyFlags = signature.getHashedSubPackets().getKeyFlags();
             if ((keyFlags & KeyFlags.SIGN_DATA) != KeyFlags.SIGN_DATA)
             {