Merge pull request #54 from pi4ohhi7/master

Auth bug fixes
LoopKit · Jun 2, 2017 · b386104 · b386104
2 parents 9eaa85c + 92057e8
commit b386104
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xDripG5/AESCrypt.m b/xDripG5/AESCrypt.m
@@ -13,7 +13,7 @@ @implementation AESCrypt
 
 + (NSData *)encryptData:(NSData *)data usingKey:(NSData *)key error:(NSError * _Nullable __autoreleasing *)error
 {
-    NSMutableData *dataOut = [[NSMutableData alloc] initWithCapacity:16];
+    NSMutableData *dataOut = [NSMutableData dataWithLength: data.length + kCCBlockSizeAES128];
 
     CCCryptorStatus status = CCCrypt(kCCEncrypt,
                                      kCCAlgorithmAES,

diff --git a/xDripG5/Messages/AuthRequestTxMessage.swift b/xDripG5/Messages/AuthRequestTxMessage.swift
@@ -19,7 +19,7 @@ struct AuthRequestTxMessage: TransmitterTxMessage {
 
         NSUUID().getBytes(&UUIDBytes)
 
-        singleUseToken = Data(bytes: UUIDBytes)
+        singleUseToken = Data(bytes: UUIDBytes[0..<8])
     }
 
     var byteSequence: [Any] {