moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

allow user packets with only revocation packet

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-05-28 22:00:08 +02:00
parent 007bbdda2b
commit b2f32827c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -648,10 +648,6 @@ public class ProviderHelper {
UserPacketItem item = uids.get(userIdRank); UserPacketItem item = uids.get(userIdRank);
operations.add(buildUserIdOperations(masterKeyId, item, userIdRank)); operations.add(buildUserIdOperations(masterKeyId, item, userIdRank));
if (item.selfCert == null) {
throw new AssertionError("User ids MUST be self-certified at this point!!");
}
if (item.selfRevocation != null) { if (item.selfRevocation != null) {
operations.add(buildCertOperations(masterKeyId, userIdRank, item.selfRevocation, operations.add(buildCertOperations(masterKeyId, userIdRank, item.selfRevocation,
Certs.VERIFIED_SELF)); Certs.VERIFIED_SELF));
@ -659,6 +655,10 @@ public class ProviderHelper {
continue; continue;
} }
if (item.selfCert == null) {
throw new AssertionError("User ids MUST be self-certified at this point!!");
}
operations.add(buildCertOperations(masterKeyId, userIdRank, item.selfCert, operations.add(buildCertOperations(masterKeyId, userIdRank, item.selfCert,
selfCertsAreTrusted ? Certs.VERIFIED_SECRET : Certs.VERIFIED_SELF)); selfCertsAreTrusted ? Certs.VERIFIED_SECRET : Certs.VERIFIED_SELF));