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

Allow usage of uploaded PGP keys

Browse source
This commit is contained in:
Evgeny Morozov 2017-02-24 17:59:04 +03:00 • committed by Bob Sun
parent 5e581aa6da
commit bb654849af
2 changed files with 70 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pass/Models/PasswordStore.swift
View file

@ -171,12 +171,16 @@ class PasswordStore {
if pgp.getKeysOf(.secret).count == 0 {
throw NSError(domain: "me.mssun.pass.error", code: 2, userInfo: [NSLocalizedDescriptionKey: "Cannot import seceret key."])
}
let key = pgp.getKeysOf(.public)[0]
let key: PGPKey = getPgpPrivateKey()
Defaults[.pgpKeyID] = key.keyID!.shortKeyString
if let gpgUser = key.users[0] as? PGPUser {
Defaults[.pgpKeyUserID] = gpgUser.userID
}
}
func getPgpPrivateKey() -> PGPKey {
return pgp.getKeysOf(.secret)[0]
}
func initPGP(pgpPublicKeyURL: URL, pgpPublicKeyLocalPath: String, pgpPrivateKeyURL: URL, pgpPrivateKeyLocalPath: String) throws {
let pgpPublicData = try Data(contentsOf: pgpPublicKeyURL)
@ -192,7 +196,6 @@ class PasswordStore {
try initPGP(pgpPublicKeyLocalPath: pgpPublicKeyLocalPath, pgpPrivateKeyLocalPath: pgpPrivateKeyLocalPath)
}
func cloneRepository(remoteRepoURL: URL,
credential: GitCredential,
transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,