From 1e1d6f0f44eea99b8af8f2bd4dffdbcef4bebff3 Mon Sep 17 00:00:00 2001 From: Mingshen Sun Date: Thu, 7 Jan 2021 22:35:45 -0800 Subject: [PATCH] Fix passphrase issue --- passKit/Crypto/PGPAgent.swift | 4 ++-- passKit/Helpers/Utils.swift | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/passKit/Crypto/PGPAgent.swift b/passKit/Crypto/PGPAgent.swift index a62b552..b7dd8df 100644 --- a/passKit/Crypto/PGPAgent.swift +++ b/passKit/Crypto/PGPAgent.swift @@ -105,9 +105,9 @@ public class PGPAgent { // Get the PGP key passphrase. var passphrase = "" if previousDecryptStatus == false { - passphrase = requestPGPKeyPassphrase("default") + passphrase = requestPGPKeyPassphrase("") } else { - passphrase = keyStore.get(for: Globals.pgpKeyPassphrase) ?? requestPGPKeyPassphrase("default") + passphrase = keyStore.get(for: AppKeychain.getPGPKeyPassphraseKey(keyID: "")) ?? requestPGPKeyPassphrase("") } // Decrypt. guard let result = try pgpInterface!.decrypt(encryptedData: encryptedData, keyID: nil, passphrase: passphrase) else { diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift index 7b1d5d5..37de0c4 100644 --- a/passKit/Helpers/Utils.swift +++ b/passKit/Helpers/Utils.swift @@ -43,7 +43,12 @@ public enum Utils { let sem = DispatchSemaphore(value: 0) var passphrase = "" 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 alert = UIAlertController(title: title, message: message, preferredStyle: .alert) alert.addAction(