moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 23:12:06 -05:00
Code Issues Releases Wiki Activity

add support for user attributes in merge() routine

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-01-13 20:35:27 +01:00
parent 189c321528
commit 08ea4e1b7e
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -1018,8 +1018,8 @@ public class UncachedKeyRing {
/** This operation merges information from a different keyring, returning a combined /** This operation merges information from a different keyring, returning a combined
* UncachedKeyRing. * UncachedKeyRing.
* *
* The combined keyring contains the subkeys and user ids of both input keyrings, but it does * The combined keyring contains the subkeys, user ids and user attributes of both input
* not necessarily have the canonicalized property. * keyrings, but it does not necessarily have the canonicalized property.
* *
* @param other The UncachedKeyRing to merge. Must not be empty, and of the same masterKeyId * @param other The UncachedKeyRing to merge. Must not be empty, and of the same masterKeyId
* @return A consolidated UncachedKeyRing with the data of both input keyrings. Same type as * @return A consolidated UncachedKeyRing with the data of both input keyrings. Same type as
@ -1139,6 +1139,32 @@ public class UncachedKeyRing {
modified = PGPPublicKey.addCertification(modified, rawUserId, cert); modified = PGPPublicKey.addCertification(modified, rawUserId, cert);
} }
} }
// Copy over all user attribute certificates
for (PGPUserAttributeSubpacketVector vector :
new IterableIterator<PGPUserAttributeSubpacketVector>(key.getUserAttributes())) {
@SuppressWarnings("unchecked")
Iterator<PGPSignature> signaturesIt = key.getSignaturesForUserAttribute(vector);
// no signatures for this user attribute attribute, skip it
if (signaturesIt == null) {
continue;
}
for (PGPSignature cert : new IterableIterator<PGPSignature>(signaturesIt)) {
// Don't merge foreign stuff into secret keys
if (cert.getKeyID() != masterKeyId && isSecret()) {
continue;
}
byte[] encoded = cert.getEncoded();
// Known cert, skip it
if (certs.contains(encoded)) {
continue;
}
newCerts += 1;
certs.add(encoded);
modified = PGPPublicKey.addCertification(modified, vector, cert);
}
}
// If anything changed, save the updated (sub)key // If anything changed, save the updated (sub)key
if (modified != resultKey) { if (modified != resultKey) {
result = replacePublicKey(result, modified); result = replacePublicKey(result, modified);