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

Fix passphrase issue

Browse source
This commit is contained in:
Mingshen Sun 2021-01-07 22:35:45 -08:00
parent a62792bd11
commit 1e1d6f0f44
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
passKit/Crypto/PGPAgent.swift
View file

@ -105,9 +105,9 @@ public class PGPAgent {
// Get the PGP key passphrase. // Get the PGP key passphrase.
var passphrase = "" var passphrase = ""
if previousDecryptStatus == false { if previousDecryptStatus == false {
passphrase = requestPGPKeyPassphrase("default") passphrase = requestPGPKeyPassphrase("")
} else { } else {
passphrase = keyStore.get(for: Globals.pgpKeyPassphrase) ?? requestPGPKeyPassphrase("default") passphrase = keyStore.get(for: AppKeychain.getPGPKeyPassphraseKey(keyID: "")) ?? requestPGPKeyPassphrase("")
} }
// Decrypt. // Decrypt.
guard let result = try pgpInterface!.decrypt(encryptedData: encryptedData, keyID: nil, passphrase: passphrase) else { guard let result = try pgpInterface!.decrypt(encryptedData: encryptedData, keyID: nil, passphrase: passphrase) else {

7
passKit/Helpers/Utils.swift
View file

@ -43,7 +43,12 @@ public enum Utils {
let sem = DispatchSemaphore(value: 0) let sem = DispatchSemaphore(value: 0)
var passphrase = "" var passphrase = ""
DispatchQueue.main.async { DispatchQueue.main.async {
let title = "Passphrase".localize() + " (\(keyID.suffix(8)))" var title: String!
if keyID.isEmpty {
title = "Passphrase".localize()
} else {
title = "Passphrase".localize() + " (\(keyID.suffix(8)))"
}
let message = "FillInPgpPassphrase.".localize() let message = "FillInPgpPassphrase.".localize()
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction( alert.addAction(