PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

check whether the hashed packet is non-null before using it, also checking the unhashed ones in the same manner... not sure whether that's needed, but can't hurt? Fixes issue 17.

Browse source
This commit is contained in:
Thialfihar 2010-05-04 13:11:56 +00:00
parent 95e02158d8
commit 778f51dbaa
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/org/thialfihar/android/apg/Apg.java
View file

@ -1019,13 +1019,21 @@ public class Apg {
} }
for (PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignatures())) { for (PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignatures())) {
if (!key.isMasterKey() || sig.getKeyID() == key.getKeyID()) { if (key.isMasterKey() && sig.getKeyID() != key.getKeyID()) {
PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets(); continue;
}
PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets();
if ((hashed.getKeyFlags() & if (hashed != null &&(hashed.getKeyFlags() &
(KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE)) != 0) { (KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE)) != 0) {
return true; return true;
} }
PGPSignatureSubpacketVector unhashed = sig.getUnhashedSubPackets();
if (unhashed != null &&(unhashed.getKeyFlags() &
(KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE)) != 0) {
return true;
} }
} }
return false; return false;
@ -1046,12 +1054,19 @@ public class Apg {
} }
for (PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignatures())) { for (PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignatures())) {
if (!key.isMasterKey() || sig.getKeyID() == key.getKeyID()) { if (key.isMasterKey() && sig.getKeyID() != key.getKeyID()) {
PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets(); continue;
}
PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets();
if ((hashed.getKeyFlags() & KeyFlags.SIGN_DATA) != 0) { if (hashed != null && (hashed.getKeyFlags() & KeyFlags.SIGN_DATA) != 0) {
return true; return true;
} }
PGPSignatureSubpacketVector unhashed = sig.getUnhashedSubPackets();
if (unhashed != null && (unhashed.getKeyFlags() & KeyFlags.SIGN_DATA) != 0) {
return true;
} }
} }