lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Change logic of passphrass for multikeys

Browse source
This commit is contained in:
Mingshen Sun 2020-04-13 19:15:52 -07:00
parent e9c5b63c4b
commit eb6e854d92
15 changed files with 95 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

10
passKit/Crypto/PGPAgent.swift
View file

@ -35,14 +35,14 @@ public class PGPAgent {
pgpInterface = nil
}
public func getKeyId() throws -> String? {
public func getKeyID() throws -> [String] {
try checkAndInit()
return pgpInterface?.keyId
return pgpInterface?.keyID ?? []
}
public func getShortKeyId() throws -> String? {
public func getShortKeyID() throws -> [String] {
try checkAndInit()
return pgpInterface?.shortKeyId
return pgpInterface?.shortKeyID ?? []
}
public func decrypt(encryptedData: Data, keyID: String, requestPGPKeyPassphrase: (String) -> String) throws -> Data? {
@ -56,7 +56,7 @@ public class PGPAgent {
if previousDecryptStatus == false {
passphrase = requestPGPKeyPassphrase(keyID)
} else {
passphrase = keyStore.get(for: Globals.pgpKeyPassphrase) ?? requestPGPKeyPassphrase(keyID)
passphrase = keyStore.get(for: AppKeychain.getPGPKeyPassphraseKey(keyID: keyID)) ?? requestPGPKeyPassphrase(keyID)
}
// Decrypt.
guard let result = try pgpInterface!.decrypt(encryptedData: encryptedData, keyID: keyID, passphrase: passphrase) else {