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

Change logic of passphrass for multikeys

Browse source
This commit is contained in:
Mingshen Sun 2020-04-13 19:15:52 -07:00
parent e9c5b63c4b
commit eb6e854d92
15 changed files with 95 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

15
passKit/Crypto/GopenPgp.swift
View file

@ -52,13 +52,14 @@ struct GopenPgp: PgpInterface {
for line in str.splitByNewline() {
if line.trimmed.uppercased().hasPrefix("-----BEGIN PGP") {
key = ""
key += line + "\n"
key += line
} else if line.trimmed.uppercased().hasPrefix("-----END PGP") {
key += line
keys.append(key)
} else {
key += line + "\n"
key += line
}
key += "\n"
}
return keys
}
@ -114,14 +115,12 @@ struct GopenPgp: PgpInterface {
return encryptedData.getBinary()!
}
var keyId: String {
let fingerprint = publicKeys.first?.key ?? ""
return String(fingerprint).uppercased()
var keyID: [String] {
return publicKeys.keys.map({ $0.uppercased() })
}
var shortKeyId: String {
let fingerprint = publicKeys.first?.key ?? ""
return String(fingerprint.suffix(8)).uppercased()
var shortKeyID: [String] {
return publicKeys.keys.map({ $0.suffix(8).uppercased()})
}
private func createPgpMessage(from encryptedData: Data) -> CryptoPGPMessage? {