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

Fix decryption issue when key without passphrase set

Browse source
This commit is contained in:
Mingshen Sun 2021-01-10 15:01:21 -08:00
parent 776884e894
commit 011762c4bd
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
4 changed files with 153 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
passKitTests/Crypto/CryptoFrameworkTest.swift
View file

@ -39,6 +39,7 @@ class CryptoFrameworkTest: XCTestCase {
try [
RSA2048,
RSA2048_SUB,
RSA3072_NO_PASSPHRASE,
RSA4096,
RSA4096_SUB,
ED25519,
@ -55,7 +56,14 @@ class CryptoFrameworkTest: XCTestCase {
XCTAssert(publicKey.getHexKeyID().hasSuffix(testKeyInfo.fingerprint))
XCTAssertNil(error)
let unlockedKey = try privateKey.unlock(testKeyInfo.passphrase.data(using: .utf8))
var isLocked: ObjCBool = false
try privateKey.isLocked(&isLocked)
var unlockedKey: CryptoKey!
if isLocked.boolValue {
unlockedKey = try privateKey.unlock(testKeyInfo.passphrase.data(using: .utf8))
} else {
unlockedKey = privateKey
}
let encryptedMessage = try CryptoNewKeyRing(publicKey, &error)?.encrypt(plainMessage, privateKey: nil)
let decryptedData = try CryptoNewKeyRing(unlockedKey, &error)?.decrypt(messageConverter(encryptedMessage!, &error), verifyKey: nil, verifyTime: 0)
XCTAssertNil(error)