Merge pull request #16 from ghbutton/master

Internal upgrade

Author: pedrouid

README.md

@@ -127,21 +127,21 @@ const ivArrayBuffer = await RNSimpleCrypto.utils.randomBytes(16);
 console.log("randomBytes iv", ivArrayBuffer);
 
 const cipherTextArrayBuffer = await RNSimpleCrypto.AES.encrypt(
-  msgArrayBuffer,
+  messageArrayBuffer,
   keyArrayBuffer,
   ivArrayBuffer
 );
 console.log("AES encrypt", cipherTextArrayBuffer);
 
-const messageArrayBuffer = await RNSimpleCrypto.AES.decrypt(
+const decryptedArrayBuffer = await RNSimpleCrypto.AES.decrypt(
   cipherTextArrayBuffer,
   keyArrayBuffer,
   ivArrayBuffer
 );
-const message = RNSimpleCrypto.utils.convertArrayBufferToUtf8(
-  messageArrayBuffer
+const decrypted = RNSimpleCrypto.utils.convertArrayBufferToUtf8(
+ decryptedArrayBuffer
 );
-console.log("AES decrypt", message);
+console.log("AES decrypt", decrypted);
 
 // -- HMAC ------------------------------------------------------------ //
 

android/src/main/java/org/walletconnect/crypto/RCTAes.java

@@ -61,9 +61,9 @@ public String getName() {
     }
 
     @ReactMethod
-    public void encrypt(String data, String keyBase64, String ivBase64, Promise promise) {
+    public void encrypt(String dataBase64, String keyBase64, String ivBase64, Promise promise) {
         try {
-            String result = encrypt(data, keyBase64, ivBase64);
+            String result = encrypt(dataBase64, keyBase64, ivBase64);
             promise.resolve(result);
         } catch (Exception e) {
             promise.reject("-1", e.getMessage());
@@ -116,8 +116,8 @@ public static String bytesToHex(byte[] bytes) {
 
     final static IvParameterSpec emptyIvSpec = new IvParameterSpec(new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
 
-    private static String encrypt(String text, String hexKey, String hexIv) throws Exception {
-        if (text == null || text.length() == 0) {
+    private static String encrypt(String textBase64, String hexKey, String hexIv) throws Exception {
+        if (textBase64 == null || textBase64.length() == 0) {
             return null;
         }
 
@@ -126,7 +126,8 @@ private static String encrypt(String text, String hexKey, String hexIv) throws E
 
         Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, hexIv == null ? emptyIvSpec : new IvParameterSpec(Hex.decode(hexIv)));
-        byte[] encrypted = cipher.doFinal(text.getBytes("UTF-8"));
+        byte [] textBytes = Base64.getEncoder().decode(textBase64);
+        byte[] encrypted = cipher.doFinal(textBytes);
         return Base64.encodeToString(encrypted, Base64.NO_WRAP);
     }
 
@@ -141,7 +142,7 @@ private static String decrypt(String ciphertext, String hexKey, String hexIv) th
         Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
         cipher.init(Cipher.DECRYPT_MODE, secretKey, hexIv == null ? emptyIvSpec : new IvParameterSpec(Hex.decode(hexIv)));
         byte[] decrypted = cipher.doFinal(Base64.decode(ciphertext, Base64.NO_WRAP));
-        return new String(decrypted, "UTF-8");
+        return Base64.encodeToString(decrypted, Base64.NO_WRAP)
     }
 
 }

index.js

@@ -91,11 +91,11 @@ function randomBytes(length) {
 
 const AES = {
   encrypt: function(textArrayBuffer, keyArrayBuffer, ivArrayBuffer) {
-    const textString = convertArrayBufferToUtf8(textArrayBuffer);
+    const textBase64 = convertArrayBufferToBase64(textArrayBuffer);
     const keyHex = convertArrayBufferToHex(keyArrayBuffer);
     const ivHex = convertArrayBufferToHex(ivArrayBuffer);
     return new Promise((resolve, reject) => {
-      NativeModules.Aes.encrypt(textString, keyHex, ivHex)
+      NativeModules.Aes.encrypt(textBase64, keyHex, ivHex)
         .then(cipherTextBase64 => {
           const result = convertBase64ToArrayBuffer(cipherTextBase64);
           resolve(result);
@@ -110,7 +110,7 @@ const AES = {
     return new Promise((resolve, reject) => {
       NativeModules.Aes.decrypt(cipherTextBase64, keyHex, ivHex)
         .then(textString => {
-          const result = convertUtf8ToArrayBuffer(textString);
+          const result = convertBase64ToArrayBuffer(textString);
           resolve(result);
         })
         .catch(error => reject(error));

ios/RCTCrypto/RCTAes.m

@@ -5,11 +5,11 @@ @implementation RCTAes
 
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_METHOD(encrypt:(NSString *)data key:(NSString *)key iv:(NSString *)iv
+RCT_EXPORT_METHOD(encrypt:(NSString *)dataBase64 key:(NSString *)key iv:(NSString *)iv
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSError *error = nil;
-    NSString *base64 = [Aes encrypt:data key:key iv:iv];
+    NSString *base64 = [Aes encrypt:dataBase64 key:key iv:iv];
     if (base64 == nil) {
         reject(@"encrypt_fail", @"Encrypt error", error);
     } else {

ios/RCTCrypto/lib/Aes.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
 @interface Aes : NSObject
-+ (NSString *) encrypt: (NSString *)clearText  key: (NSString *)key iv: (NSString *)iv;
++ (NSString *) encrypt: (NSString *)clearText64  key: (NSString *)key iv: (NSString *)iv;
 + (NSString *) decrypt: (NSString *)cipherText key: (NSString *)key iv: (NSString *)iv;
 @end

ios/RCTCrypto/lib/Aes.m

@@ -34,14 +34,15 @@ + (NSData *) AES128CBC: (NSString *)operation data: (NSData *)data key: (NSStrin
     return nil;
 }
 
-+ (NSString *) encrypt: (NSString *)clearText key: (NSString *)key iv: (NSString *)iv {
-    NSData *result = [self AES128CBC:@"encrypt" data:[clearText dataUsingEncoding:NSUTF8StringEncoding] key:key iv:iv];
++ (NSString *) encrypt: (NSString *)clearText64 key: (NSString *)key iv: (NSString *)iv {
+    NSData* clearData = [[NSData alloc] initWithBase64EncodedString:clearText64 options:0];
+    NSData *result = [self AES128CBC:@"encrypt" data:clearData 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];
-    return [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding];
+    return [result base64EncodedStringWithOptions:0];
 }
 
 @end

ios/RCTCrypto/lib/Shared.m

@@ -7,10 +7,13 @@
 @implementation Shared
 
 + (NSString *) toHex:(NSData *)nsdata {
-    NSString * hexStr = [NSString stringWithFormat:@"%@", nsdata];
-    for(NSString * toRemove in [NSArray arrayWithObjects:@"<", @">", @" ", nil])
-        hexStr = [hexStr stringByReplacingOccurrencesOfString:toRemove withString:@""];
-    return hexStr;
+    // Copied from: https://riptutorial.com/ios/example/18979/converting-nsdata-to-hex-string
+    const unsigned char *bytes = (const unsigned char *)nsdata.bytes;
+    NSMutableString *hex = [NSMutableString new];
+    for (NSInteger i = 0; i < nsdata.length; i++) {
+        [hex appendFormat:@"%02x", bytes[i]];
+    }
+    return [hex copy];
 }
 
 + (NSData *) fromHex: (NSString *)string {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-crypto",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "A simpler React-Native crypto library",
   "main": "index.js",
   "author": "Pedro Gomes <pedro@pedrouid.com>",