zcash-hackworks
/
MnemonicSwift
mirror of https://github.com/zcash-hackworks/MnemonicSwift.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More refactoring for readability

This commit is contained in:
keefertaylor 2018-10-28 20:24:24 +00:00
parent 451eb366d2
commit 324e3ae337
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Sources/MnemonicKit/Mnemonic.swift
View File

@ -67,20 +67,15 @@ public class Mnemonic: NSObject {
public static func deterministicSeedString(from mnemonic: String,
passphrase: String = "",
language: MnemonicLanguageType = .english) throws -> String {
guard let normalizedData = self.normalized(string: mnemonic) else {
guard let normalizedData = self.normalized(string: mnemonic),
let saltData = normalized(string: "mnemonic" + passphrase) else {
return ""
}
guard let saltData = normalized(string: "mnemonic" + passphrase) else {
return ""
}
let password = normalizedData.bytes
let salt = saltData.bytes
let passwordBytes = normalizedData.bytes
let saltBytes = saltData.bytes
do {
let bytes = try PKCS5.PBKDF2(password: password, salt: salt, iterations: 2048, variant: .sha512).calculate()
let bytes = try PKCS5.PBKDF2(password: passwordBytes, salt: saltBytes, iterations: 2048, variant: .sha512).calculate()
return bytes.toHexString()
} catch {
throw error