Fix key size

tectiv3 · tectiv3 · commit d3175a01f4ea · 2019-01-16T00:23:55.000+09:00
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,21 @@
+module.exports = {
+    printWidth: 100,
+    tabWidth: 4,
+    useTabs: false,
+    semi: false,
+    singleQuote: true,
+    trailingComma: 'es5',
+    bracketSpacing: true,
+    jsxBracketSameLine: false,
+    arrowParens: 'avoid',
+    proseWrap: 'never',
+    overrides: [
+        {
+            files: '*.vue',
+            options: {
+                printWidth: 100,
+            },
+            parser: 'vue',
+        },
+    ],
+}
diff --git a/README.md b/README.md
@@ -3,28 +3,34 @@
 AES encryption/decryption for react-native
 
 ## Installation
+
 ```sh
 npm install --save react-native-aes-crypto
 ```
+
 or
+
 ```sh
 yarn add react-native-aes-crypto
 ```
+
 ### Installation (iOS)
-* See [Linking Libraries](http://facebook.github.io/react-native/docs/linking-libraries-ios.html)
-OR
-* Drag RCTAes.xcodeproj to your project on Xcode.
-* Click on your main project file (the one that represents the .xcodeproj) select Build Phases and drag libRCTAes.a from the Products folder inside the RCTAes.xcodeproj.
+
+-   See [Linking Libraries](http://facebook.github.io/react-native/docs/linking-libraries-ios.html) OR
+-   Drag RCTAes.xcodeproj to your project on Xcode.
+-   Click on your main project file (the one that represents the .xcodeproj) select Build Phases and drag libRCTAes.a from the Products folder inside the RCTAes.xcodeproj.
 
 ### Installation (Android)
+
 #### Untested!
+
 ```gradle
 ...
 include ':react-native-aes-crypto'
 project(':react-native-aes-crypto').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-aes-crypto/android')
 ```
 
-* In `android/app/build.gradle`
+-   In `android/app/build.gradle`
 
 ```gradle
 ...
@@ -34,7 +40,7 @@ dependencies {
 }
 ```
 
-* register module (in MainApplication.java)
+-   register module (in MainApplication.java)
 
 ```java
 ......
@@ -55,40 +61,47 @@ protected List<ReactPackage> getPackages() {
 ### Example
 
 ```js
-import { NativeModules, Platform } from 'react-native';
-var Aes = NativeModules.Aes;
+import { NativeModules, Platform } from 'react-native'
+var Aes = NativeModules.Aes
 
-
-const generateKey = (password, salt, cost, length) => Aes.pbkdf2(password, salt, cost, length);
+const generateKey = (password, salt, cost, length) => Aes.pbkdf2(password, salt, cost, length)
 
 const encrypt = (text, keyBase64) => {
-    var ivBase64 = "base64 random 16 bytes string";
-    return Aes.encrypt(text, keyBase64, ivBase64).then(cipher => ({ cipher, iv: ivBase64 }));
-};
+    return Aes.randomKey(32).then(iv => {
+        return Aes.encrypt(text, keyBase64, iv).then(cipher => ({
+            cipher,
+            iv,
+        }))
+    })
+}
 
-const decrypt = (encryptedData, key) => Aes.decrypt(encryptedData.cipher, key, encryptedData.iv);
+const decrypt = (encryptedData, key) => Aes.decrypt(encryptedData.cipher, key, encryptedData.iv)
 
 try {
-    generateKey("Arnold", "salt", 5000, 512).then(key => {
-        console.log('Key:', key);
-        encrypt("These violent delights have violent ends", key).then(({cipher, iv}) => {
-            console.log("Encrypted:", cipher);
-            
-            decrypt({ cipher, iv }, key).then(text => {
-                console.log("Decrypted:", text);
-            }).catch(error => {
-                console.log(error);
-            });
-            
-            Aes.hmac256(cipher, key).then(hash => {
-                console.log("HMAC", hash);
-            });
-        }).catch(error => {
-            console.log(error);
-        });
-    });
+    generateKey('Arnold', 'salt', 5000, 512).then(key => {
+        console.log('Key:', key)
+        encrypt('These violent delights have violent ends', key)
+            .then(({ cipher, iv }) => {
+                console.log('Encrypted:', cipher)
+
+                decrypt({ cipher, iv }, key)
+                    .then(text => {
+                        console.log('Decrypted:', text)
+                    })
+                    .catch(error => {
+                        console.log(error)
+                    })
+
+                Aes.hmac256(cipher, key).then(hash => {
+                    console.log('HMAC', hash)
+                })
+            })
+            .catch(error => {
+                console.log(error)
+            })
+    })
 } catch (e) {
-    console.error(e);
+    console.error(e)
 }
 ```
 
@@ -97,23 +110,23 @@ try {
 ```js
 async function asyncDecrypt(cipher, key, iv) {
     try {
-        var text = await decrypt({ cipher, iv }, key);
-        console.log(text);
-        return text;
+        var text = await decrypt({ cipher, iv }, key)
+        console.log(text)
+        return text
     } catch (e) {
-        console.error(e);
+        console.error(e)
     }
 }
 ```
 
 ### methods
 
-- `encrypt(text, key, iv)`
-- `decrypt(base64, key, iv)`
-- `pbkdf2(text, salt, cost, length)`
-- `hmac256(cipher, key)`
-- `sha1(text)`
-- `sha256(text)`
-- `sha512(text)`
-- `randomUuid()`
-- `randomKey(length)`
+-   `encrypt(text, key, iv)`
+-   `decrypt(base64, key, iv)`
+-   `pbkdf2(text, salt, cost, length)`
+-   `hmac256(cipher, key)`
+-   `sha1(text)`
+-   `sha256(text)`
+-   `sha512(text)`
+-   `randomUuid()`
+-   `randomKey(length)`
diff --git a/ios/RCTAes.xcodeproj/project.pbxproj b/ios/RCTAes.xcodeproj/project.pbxproj
@@ -105,7 +105,7 @@
 		32D980D51BE9F11C00FA27E5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = tectiv3;
 				TargetAttributes = {
 					32D980DC1BE9F11C00FA27E5 = {
@@ -151,20 +151,29 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -195,14 +204,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/ios/RCTAes/lib/AesCrypt.m b/ios/RCTAes/lib/AesCrypt.m
@@ -74,7 +74,7 @@ + (NSData *) AES128CBC: (NSString *)operation data: (NSData *)data key: (NSStrin
                                           [operation isEqualToString:@"encrypt"] ? kCCEncrypt : kCCDecrypt,
                                           kCCAlgorithmAES128,
                                           kCCOptionPKCS7Padding,
-                                          keyData.bytes, kCCKeySizeAES256,
+                                          keyData.bytes, kCCKeySizeAES128,
                                           ivData.bytes,
                                           data.bytes, data.length,
                                           buffer.mutableBytes,  buffer.length,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-aes-crypto",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "AES crypto native module for react-native",
     "main": "index.js",
     "author": "tectiv3",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-aes-crypto",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.3.1",`
`4`	`4`	`"description": "AES crypto native module for react-native",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"author": "tectiv3",`