fix keystore error when regenerating with invalid old password

Alex Vlasov · Alex Vlasov · commit 2150c0093900 · 2018-05-16T17:10:26.000+03:00
diff --git a/web3swift/KeystoreManager/Classes/BIP32Keystore.swift b/web3swift/KeystoreManager/Classes/BIP32Keystore.swift
@@ -183,6 +183,9 @@ public class BIP32Keystore: AbstractKeystore {
     
     public func regenerate(oldPassword: String, newPassword: String, dkLen: Int=32, N: Int = 262144, R: Int = 8, P: Int = 1) throws {
         var keyData = try self.getPrefixNodeData(oldPassword)
+        if keyData == nil {
+            throw AbstractKeystoreError.encryptionError("Failed to decrypt a keystore")
+        }
         defer {Data.zero(&keyData!)}
         try self.encryptDataToStorage(newPassword, data: keyData!)
     }
diff --git a/web3swift/KeystoreManager/Classes/EthereumKeystoreV3.swift b/web3swift/KeystoreManager/Classes/EthereumKeystoreV3.swift
@@ -106,6 +106,9 @@ public class EthereumKeystoreV3: AbstractKeystore {
     
     public func regenerate(oldPassword: String, newPassword: String, dkLen: Int=32, N: Int = 262144, R: Int = 8, P: Int = 1) throws {
         var keyData = try self.getKeyData(oldPassword)
+        if keyData == nil {
+            throw AbstractKeystoreError.encryptionError("Failed to decrypt a keystore")
+        }
         defer {Data.zero(&keyData!)}
         try self.encryptDataToStorage(newPassword, keyData: keyData!)
     }

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ public class BIP32Keystore: AbstractKeystore {`
`183`	`183`
`184`	`184`	`public func regenerate(oldPassword: String, newPassword: String, dkLen: Int=32, N: Int = 262144, R: Int = 8, P: Int = 1) throws {`
`185`	`185`	`var keyData = try self.getPrefixNodeData(oldPassword)`
	`186`	`+ if keyData == nil {`
	`187`	`+ throw AbstractKeystoreError.encryptionError("Failed to decrypt a keystore")`
	`188`	`+ }`
`186`	`189`	`defer {Data.zero(&keyData!)}`
`187`	`190`	`try self.encryptDataToStorage(newPassword, data: keyData!)`
`188`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ public class EthereumKeystoreV3: AbstractKeystore {`
`106`	`106`
`107`	`107`	`public func regenerate(oldPassword: String, newPassword: String, dkLen: Int=32, N: Int = 262144, R: Int = 8, P: Int = 1) throws {`
`108`	`108`	`var keyData = try self.getKeyData(oldPassword)`
	`109`	`+ if keyData == nil {`
	`110`	`+ throw AbstractKeystoreError.encryptionError("Failed to decrypt a keystore")`
	`111`	`+ }`
`109`	`112`	`defer {Data.zero(&keyData!)}`
`110`	`113`	`try self.encryptDataToStorage(newPassword, keyData: keyData!)`
`111`	`114`	`}`