Merge pull request #54 from pi4ohhi7/master

ps2 · web-flow · commit b3861049d2d7 · 2017-06-01T19:56:11.000-05:00
Auth bug fixes
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] {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ @implementation AESCrypt`
`13`	`13`
`14`	`14`	`+ (NSData )encryptData:(NSData )data usingKey:(NSData )key error:(NSError _Nullable __autoreleasing *)error`
`15`	`15`	`{`
`16`		`- NSMutableData *dataOut = [[NSMutableData alloc] initWithCapacity:16];`
	`16`	`+ NSMutableData *dataOut = [NSMutableData dataWithLength: data.length + kCCBlockSizeAES128];`
`17`	`17`
`18`	`18`	`CCCryptorStatus status = CCCrypt(kCCEncrypt,`
`19`	`19`	`kCCAlgorithmAES,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct AuthRequestTxMessage: TransmitterTxMessage {`
`19`	`19`
`20`	`20`	`NSUUID().getBytes(&UUIDBytes)`
`21`	`21`
`22`		`- singleUseToken = Data(bytes: UUIDBytes)`
	`22`	`+ singleUseToken = Data(bytes: UUIDBytes[0..<8])`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`var byteSequence: [Any] {`