FIX: ABEND when encrypting.

diff --git a/iOS/Tombo/Tombo/CryptCore.m b/iOS/Tombo/Tombo/CryptCore.m
index 28ca2a7..e5835d8 100644 (file)
--- a/iOS/Tombo/Tombo/CryptCore.m
+++ b/iOS/Tombo/Tombo/CryptCore.m
@@ -225,7 +225,7 @@
 
 + (NSData *)encrypt:(NSString *)key data:(NSData *)plain error:(NSError **)error {
     const char *plainByte = (const char *)[plain bytes];
-    NSUInteger n = strlen(plainByte);
+    NSUInteger n = [plain length];
     NSUInteger nBlocks = (n + 7) / 8;
     
     NSUInteger dataLen = 32 + nBlocks * 8;

diff --git a/iOS/Tombo/Tombo/PasswordManager.m b/iOS/Tombo/Tombo/PasswordManager.m
index 68da5f2..f41ef73 100644 (file)
--- a/iOS/Tombo/Tombo/PasswordManager.m
+++ b/iOS/Tombo/Tombo/PasswordManager.m
@@ -46,6 +46,7 @@
             [mismatch show];
             return NO;
         }
+        self.password = pass1;
     }
 
     [self resetTimer];