Dont use UTF8 for encoding since we might be trying to encrypt binary data

Author: ghbutton

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);
     }
 

index.js

@@ -91,11 +91,12 @@ function randomBytes(length) {
 
 const AES = {
   encrypt: function(textArrayBuffer, keyArrayBuffer, ivArrayBuffer) {
-    const textString = convertArrayBufferToUtf8(textArrayBuffer);
+    // Input might not be UTF8 encodable
+    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);

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,8 +34,9 @@ + (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:base64Encoded options:0];
+    NSData *result = [self AES128CBC:@"encrypt" data:clearData key:key iv:iv];
     return [result base64EncodedStringWithOptions:0];
 }