Use createPGPMessage instead of CryptoNewPGPMessage to support ASCII-…

…armored password with YubiKey (#658)
mssun · Nov 30, 2024 · c5d9d25 · c5d9d25
1 parent 5bf7ff2
commit c5d9d25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pass/Services/PasswordDecryptor.swift b/pass/Services/PasswordDecryptor.swift
@@ -206,7 +206,7 @@ func verifyPin(smartCard: YKFSmartCardInterface, pin: String) async throws {
 
 func decipher(smartCard: YKFSmartCardInterface, ciphertext: Data, chained: Bool) async throws -> Data {
     var error: NSError?
-    let message = CryptoNewPGPMessage(ciphertext)
+    let message = createPGPMessage(from: ciphertext)
     guard let mpi1 = Gopenpgp.HelperPassGetEncryptedMPI1(message, &error) else {
         throw AppError.yubiKey(.decipher(message: "Failed to get encrypted MPI."))
     }
@@ -225,7 +225,7 @@ func decipher(smartCard: YKFSmartCardInterface, ciphertext: Data, chained: Bool)
 }
 
 func decryptPassword(deciphered: Data, ciphertext: Data) throws -> String {
-    let message = CryptoNewPGPMessage(ciphertext)
+    let message = createPGPMessage(from: ciphertext)
 
     guard let algoByte = deciphered.first, let algo = symmetricKeyIDNameDict[algoByte] else {
         throw AppError.yubiKey(.decipher(message: "Failed to new session key."))

diff --git a/passKit/Crypto/GopenPGPInterface.swift b/passKit/Crypto/GopenPGPInterface.swift
@@ -147,15 +147,15 @@ struct GopenPGPInterface: PGPInterface {
     var shortKeyID: [String] {
         publicKeys.keys.map { $0.suffix(8).uppercased() }
     }
+}
 
-    private func createPGPMessage(from encryptedData: Data) -> CryptoPGPMessage? {
-        // Important note:
-        // Even if Defaults.encryptInArmored is true now, it could be different during the encryption.
-        var error: NSError?
-        let message = CryptoNewPGPMessageFromArmored(String(data: encryptedData, encoding: .ascii), &error)
-        if error == nil {
-            return message
-        }
-        return CryptoNewPGPMessage(encryptedData.mutable as Data)
+public func createPGPMessage(from encryptedData: Data) -> CryptoPGPMessage? {
+    // Important note:
+    // Even if Defaults.encryptInArmored is true now, it could be different during the encryption.
+    var error: NSError?
+    let message = CryptoNewPGPMessageFromArmored(String(data: encryptedData, encoding: .ascii), &error)
+    if error == nil {
+        return message
     }
+    return CryptoNewPGPMessage(encryptedData.mutable as Data)
 }