Merge pull request #28 from patrik-majercik/master

match iOS code with Android

Author: tectiv3

ios/RCTAes/lib/AesCrypt.m

@@ -61,7 +61,7 @@ + (NSString *) pbkdf2:(NSString *)password salt: (NSString *)salt cost: (NSInteg
     return [self toHex:hashKeyData];
 }
 
-+ (NSData *) AES128CBC: (NSString *)operation data: (NSData *)data key: (NSString *)key iv: (NSString *)iv {
++ (NSData *) AES256CBC: (NSString *)operation data: (NSData *)data key: (NSString *)key iv: (NSString *)iv {
     //convert hex string to hex data
     NSData *keyData = [self fromHex:key];
     NSData *ivData = [self fromHex:iv];
@@ -74,8 +74,8 @@ + (NSData *) AES128CBC: (NSString *)operation data: (NSData *)data key: (NSStrin
                                           [operation isEqualToString:@"encrypt"] ? kCCEncrypt : kCCDecrypt,
                                           kCCAlgorithmAES128,
                                           kCCOptionPKCS7Padding,
-                                          keyData.bytes, kCCKeySizeAES128,
-                                          ivData.bytes,
+                                          keyData.bytes, kCCKeySizeAES256,
+                                          ivData.length ? ivData.bytes : nil,
                                           data.bytes, data.length,
                                           buffer.mutableBytes,  buffer.length,
                                           &numBytes);
@@ -89,12 +89,12 @@ + (NSData *) AES128CBC: (NSString *)operation data: (NSData *)data key: (NSStrin
 }
 
 + (NSString *) encrypt: (NSString *)clearText key: (NSString *)key iv: (NSString *)iv {
-    NSData *result = [self AES128CBC:@"encrypt" data:[clearText dataUsingEncoding:NSUTF8StringEncoding] key:key iv:iv];
+    NSData *result = [self AES256CBC:@"encrypt" data:[clearText dataUsingEncoding:NSUTF8StringEncoding] key:key iv:iv];
     return [result base64EncodedStringWithOptions:0];
 }
 
 + (NSString *) decrypt: (NSString *)cipherText key: (NSString *)key iv: (NSString *)iv {
-    NSData *result = [self AES128CBC:@"decrypt" data:[[NSData alloc] initWithBase64EncodedString:cipherText options:0] key:key iv:iv];
+    NSData *result = [self AES256CBC:@"decrypt" data:[[NSData alloc] initWithBase64EncodedString:cipherText options:0] key:key iv:iv];
     return [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding];
 }