Merge pull request #7

To fix a NullPointerException that can be thrown while trying to extract usage flags from a subkey.
justinludwig · Aug 31, 2017 · 58c60bd · 58c60bd
2 parents 65c8385 + 08eff83
commit 58c60bd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/org/c02e/jpgpj/Subkey.java b/src/main/java/org/c02e/jpgpj/Subkey.java
@@ -11,6 +11,7 @@
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder;
 import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
@@ -247,9 +248,14 @@ public int getUsageFlags() throws PGPException {
         // actually only need POSITIVE_CERTIFICATION (for master key)
         // and SUBKEY_BINDING (for subkeys)
         Iterator<PGPSignature> signatures = publicKey.getSignatures();
-        while (signatures.hasNext())
-            flags |= signatures.next().getHashedSubPackets().getKeyFlags();
+        while (signatures.hasNext()) {
+            PGPSignature signature = signatures.next();
+            PGPSignatureSubpacketVector hashedSubPackets =
+                signature.getHashedSubPackets();
 
+            if (hashedSubPackets != null)
+                flags |= hashedSubPackets.getKeyFlags();
+        }
         return flags;
     }