Merge branch 'add-buffers-to-sha'

Author: Chris Thompson

android/build.gradle

@@ -23,10 +23,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.facebook.react:react-native:+'
-    compile 'com.madgag.spongycastle:core:1.58.0.0'
-    compile 'com.madgag.spongycastle:prov:1.54.0.0'
-    compile 'com.madgag.spongycastle:pkix:1.54.0.0'
-    compile 'com.madgag.spongycastle:pg:1.54.0.0'
+    implementation 'com.android.support:appcompat-v7:23.0.1'
+    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.54.0.0'
+    implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
+    implementation 'com.madgag.spongycastle:pg:1.54.0.0'
 }

android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Oct 31 17:20:33 PDT 2018
+#Mon Apr 13 18:24:21 MDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

android/gradle/wrapper/gradle-wrapper.properties

@@ -126,7 +126,7 @@ private static String encrypt(String textBase64, String hexKey, String hexIv) th
 
         Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, hexIv == null ? emptyIvSpec : new IvParameterSpec(Hex.decode(hexIv)));
-        byte [] textBytes = Base64.getEncoder().decode(textBase64);
+        byte [] textBytes = java.util.Base64.getDecoder().decode(textBase64);
         byte[] encrypted = cipher.doFinal(textBytes);
         return Base64.encodeToString(encrypted, Base64.NO_WRAP);
     }
@@ -142,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 Base64.encodeToString(decrypted, Base64.NO_WRAP)
+        return Base64.encodeToString(decrypted, Base64.NO_WRAP);
     }
 
 }

…ava/org/walletconnect/crypto/RCTAes.java …ain/java/com/pedrouid/crypto/RCTAes.javaandroid/src/main/java/org/walletconnect/crypto/RCTAes.java renamed to android/src/main/java/com/pedrouid/crypto/RCTAes.java android/src/main/java/org/walletconnect/crypto/RCTAes.java renamed to android/src/main/java/com/pedrouid/crypto/RCTAes.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Arrays;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;

…lletconnect/crypto/RCTCryptoPackage.java …om/pedrouid/crypto/RCTCryptoPackage.javaandroid/src/main/java/org/walletconnect/crypto/RCTCryptoPackage.java renamed to android/src/main/java/com/pedrouid/crypto/RCTCryptoPackage.java android/src/main/java/org/walletconnect/crypto/RCTCryptoPackage.java renamed to android/src/main/java/com/pedrouid/crypto/RCTCryptoPackage.java

@@ -4,6 +4,8 @@
 
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,7 +31,6 @@
 import org.spongycastle.crypto.digests.SHA224Digest;
 import org.spongycastle.crypto.digests.SHA256Digest;
 import org.spongycastle.crypto.digests.SHA384Digest;
-import org.spongycastle.crypto.digests.SHA384Digest;
 import org.spongycastle.crypto.digests.SHA512Digest;
 import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator;
 import org.spongycastle.crypto.PBEParametersGenerator;
@@ -52,46 +53,43 @@ public RCTSha(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
+    private static ArrayList<String> algorithms = new ArrayList<String>(
+            Arrays.asList("SHA-1",
+                    "SHA-256",
+                    "SHA-512"));
+
     @Override
     public String getName() {
         return "RCTSha";
     }
 
-    @ReactMethod
-    public void sha256(String data, Promise promise) {
-        try {
-            String result = shaX(data, "SHA-256");
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("-1", e.getMessage());
+    private byte[] sha(byte[] data, String algorithm) throws Exception {
+        if (!algorithms.contains(algorithm)) {
+            throw new Exception("Invalid algorithm");
         }
+
+        MessageDigest md = MessageDigest.getInstance(algorithm);
+        md.update(data);
+        return md.digest();
     }
 
     @ReactMethod
-    public void sha1(String data, Promise promise) {
+    public void shaBase64(String data, String algorithm, Promise promise) throws Exception {
         try {
-            String result = shaX(data, "SHA-1");
-            promise.resolve(result);
+            byte[] digest = this.sha(Base64.decode(data, Base64.NO_WRAP), algorithm);
+            promise.resolve(Base64.encodeToString(digest, Base64.NO_WRAP));
         } catch (Exception e) {
             promise.reject("-1", e.getMessage());
         }
     }
 
     @ReactMethod
-    public void sha512(String data, Promise promise) {
+    public void shaUtf8(String data, String algorithm, Promise promise) throws Exception {
         try {
-            String result = shaX(data, "SHA-512");
-            promise.resolve(result);
+            byte[] digest = data.getBytes();
+            promise.resolve(Base64.encodeToString(digest, Base64.DEFAULT));
         } catch (Exception e) {
             promise.reject("-1", e.getMessage());
         }
     }
-
-    private String shaX(String data, String algorithm) throws Exception {
-        MessageDigest md = MessageDigest.getInstance(algorithm);
-        md.update(data.getBytes());
-        byte[] digest = md.digest();
-
-        return Base64.encodeToString(digest, Base64.DEFAULT);
-    }
 }