Fix a decryption bug

This commit is contained in:
Yishi Lin 2019-09-30 00:12:54 +08:00
parent 3de2dbf8dc
commit 6b00d4911b
2 changed files with 21 additions and 7 deletions

View file

@ -47,10 +47,12 @@ struct GopenPgp: PgpInterface {
}
private func createPgpMessage(from encryptedData: Data) -> CryptoPGPMessage? {
if SharedDefaults[.encryptInArmored] {
var error: NSError?
let message = CryptoNewPGPMessageFromArmored(String(data: encryptedData, encoding: .ascii), &error)
return error == nil ? message : nil
// Important note:
// Even if SharedDefaults[.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)
}