Add ArrayBuffer support for SHA functions

Author: majorhayes

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

@@ -29,7 +29,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;
@@ -58,40 +57,28 @@ public String getName() {
     }
 
     @ReactMethod
-    public void sha256(String data, Promise promise) {
+    public void shaBase64(String data, String algorithm, Promise promise) throws Exception {
         try {
-            String result = shaX(data, "SHA-256");
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("-1", e.getMessage());
-        }
-    }
+            MessageDigest md = MessageDigest.getInstance(algorithm);
+            md.update(Base64.decode(data, Base64.NO_WRAP));
+            byte[] digest = md.digest();
 
-    @ReactMethod
-    public void sha1(String data, Promise promise) {
-        try {
-            String result = shaX(data, "SHA-1");
-            promise.resolve(result);
+            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 sha(String data, String algorithm, Promise promise) throws Exception {
         try {
-            String result = shaX(data, "SHA-512");
-            promise.resolve(result);
+            MessageDigest md = MessageDigest.getInstance(algorithm);
+            md.update(data.getBytes());
+            byte[] digest = md.digest();
+
+            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);
-    }
 }

android/src/main/java/com/pedrouid/crypto/RCTSha.java

@@ -22,8 +22,11 @@ declare module "react-native-simple-crypto" {
 
   export namespace SHA {
     export function sha1(text: string): Promise<string>;
+    export function sha1(text: ArrayBuffer): Promise<ArrayBuffer>;
     export function sha256(text: string): Promise<string>;
+    export function sha256(text: ArrayBuffer): Promise<ArrayBuffer>;
     export function sha512(text: string): Promise<string>;
+    export function sha512(text: ArrayBuffer): Promise<ArrayBuffer>;
   }
 
   export namespace HMAC {

index.d.ts

@@ -89,6 +89,17 @@ function randomBytes(length) {
   });
 }
 
+async function SHAWrapper(data, algorithm) {
+  if (typeof data === 'string') {
+    return NativeModules.Sha.sha(data, algorithm)
+  } else {
+    const dataBase64 = convertArrayBufferToBase64(data);
+    const result = await NativeModules.Sha.shaBase64(dataBase64, algorithm)
+
+    return convertBase64ToArrayBuffer(result);
+  }
+}
+
 const AES = {
   encrypt: function(textArrayBuffer, keyArrayBuffer, ivArrayBuffer) {
     const textBase64 = convertArrayBufferToBase64(textArrayBuffer);
@@ -118,7 +129,11 @@ const AES = {
   }
 };
 
-const SHA = NativeModules.Sha;
+const SHA = {
+  sha1: data => SHAWrapper(data, 'SHA-1'),
+  sha256: data => SHAWrapper(data, 'SHA-256'),
+  sha512: data => SHAWrapper(data, 'SHA-512')
+};
 
 const HMAC = {
   hmac256: function(textArrayBuffer, keyArrayBuffer) {