added check for encryption key/RSA_GENERAL back in.
@@ -411,7 +411,9 @@ public boolean isEncryptionKey()
*/
public boolean isMasterKey()
{
- return !(publicPk instanceof PublicSubkeyPacket);
+ // this might seem a bit excessive, but we're also trying to flag something can't be a master key.
+ return !(publicPk instanceof PublicSubkeyPacket)
+ && !(this.isEncryptionKey() && publicPk.getAlgorithm() != PublicKeyAlgorithmTags.RSA_GENERAL);
}
/**
