cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix selection of signing or auth subkey if there are multiple candidates

Browse Source 
Fixes #2879
This commit is contained in:
Vincent Breitmoser
2024-02-18 14:11:08 +01:00
parent 3d70875726
commit 5cc2d88ab9
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java
View File

@@ -264,11 +264,23 @@ public class KeyRepository extends AbstractDao {
} }
public long getSecretSignId(long masterKeyId) throws NotFoundException { public long getSecretSignId(long masterKeyId) throws NotFoundException {
return keysQueries.selectEffectiveSignKeyIdByMasterKeyId(masterKeyId).executeAsOneOrNull(); List<Long> candidates =
keysQueries.selectEffectiveSignKeyIdByMasterKeyId(masterKeyId).executeAsList();
if (candidates.isEmpty()) {
throw new NotFoundException();
}
// If there are multiple candidates for authentication, pick an arbitrary one
return candidates.get(0);
} }
public long getEffectiveAuthenticationKeyId(long masterKeyId) throws NotFoundException { public long getEffectiveAuthenticationKeyId(long masterKeyId) throws NotFoundException {
return keysQueries.selectEffectiveAuthKeyIdByMasterKeyId(masterKeyId).executeAsOneOrNull(); List<Long> candidates =
keysQueries.selectEffectiveAuthKeyIdByMasterKeyId(masterKeyId).executeAsList();
if (candidates.isEmpty()) {
throw new NotFoundException();
}
// If there are multiple candidates for authentication, pick an arbitrary one
return candidates.get(0);
} }
public List<Long> getPublicEncryptionIds(long masterKeyId) { public List<Long> getPublicEncryptionIds(long masterKeyId) {