From 62032cd7d07ca7569da745258929bf1df5a7283a Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Tue, 5 Jan 2021 18:12:28 +0100 Subject: [PATCH] Updated to current KeePassKit. Fixed nil assertion when using invalid OTP parameters --- Cartfile | 2 +- Cartfile.resolved | 4 ++-- MacPass/MPTOTPViewController.m | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index e56324aa..091cffa4 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ github "sparkle-project/Sparkle" ~> 1.22 github "mattt/TransformerKit" ~> 1.1.1 -github "MacPass/KeePassKit" "e22b8f2e5b4f8bccdea7630318e42eeb6eec23b5" +github "MacPass/KeePassKit" "53fb31cd39eb56b75a27867aa4594f73e380863c" github "mstarke/HNHUi" ~> 4.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 49d5eaaf..6a86b77f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -github "MacPass/KeePassKit" "e22b8f2e5b4f8bccdea7630318e42eeb6eec23b5" +github "MacPass/KeePassKit" "53fb31cd39eb56b75a27867aa4594f73e380863c" github "mattt/TransformerKit" "1.1.1" github "mstarke/HNHUi" "4.0.3" -github "robbiehanson/KissXML" "5.3.2" +github "robbiehanson/KissXML" "5.3.3" github "sparkle-project/Sparkle" "1.24.0" diff --git a/MacPass/MPTOTPViewController.m b/MacPass/MPTOTPViewController.m index b08d4241..8e76c6cb 100644 --- a/MacPass/MPTOTPViewController.m +++ b/MacPass/MPTOTPViewController.m @@ -56,7 +56,8 @@ if(showTOTP) { self.generator = [[KPKTimeOTPGenerator alloc] initWithEntry:entry]; self.generator.time = NSDate.date.timeIntervalSince1970; - self.toptValueTextField.stringValue = self.generator.string; + NSString *stringValue = self.generator.string; + self.toptValueTextField.stringValue = stringValue ? stringValue : @""; NSString *template = NSLocalizedString(@"TOTP_REMAINING_TIME_%ld_SECONDS", @"Time in seconds remaining for a valid TOTP string, format should be %ld");