Merge pull request #2 from Dead4W/async

Best perfomance with WebCrypto
Dead4W · Jan 6, 2021 · 5d332fd · 5d332fd
2 parents dec3e0e + eba2c6e
commit 5d332fd
Show file tree

Hide file tree

Showing 8 changed files with 291 additions and 305 deletions.
diff --git a/README.md b/README.md
@@ -21,11 +21,6 @@ Requirements
 
  - CryptoJS (https://cryptojs.gitbook.io/docs/)
     - core.js
-    - cipher-core.js
-    - aes.js
-    - hmac.js
-    - sha256.js
-    - pad-nopadding.js
     - enc-utf16.js
  - enc-uint8array.js (Custom Uint8Array encoding)
 
@@ -39,25 +34,22 @@ const aes = AesCrypt();
 
 let fileSecret = document.getElementById("fileSecret").files[0];
 
-var password = "foopassword"
+let password = "foopassword"
 
 // encryption/decryption
 
-// **IMPORTANT** Only for workers!
-let progress_callback = (current) => {let percent = current * 100;};
-
 // encrypt typed array (Uint8Array)
-aes.encrypt(fileSecret, password, progress_callback).then((encrypted) => {
+aes.encrypt(fileSecret, password).then((encrypted) => {
   console.log(encrypted);
 });
 
 let fileEncrypted = document.getElementById("fileEncrypted").files[0];
 
 // decrypt typed array (Uint8Array)
-aes.decrypt(fileEncrypted, password, progress_callback).then((decrypted) => {
+aes.decrypt(fileEncrypted, password).then((decrypted) => {
 
   // transform Uint8Array to Latin1 string
-  let secret = aes.utils.bytes_to_latin1(decrypted);
+  let secret = aes.utils.bytes2str(decrypted);
 
   console.log(secret);
 });

diff --git a/demo/index.html b/demo/index.html
@@ -2,11 +2,6 @@
 <head>
 	<title></title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/core.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/cipher-core.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/aes.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/hmac.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/sha256.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/pad-nopadding.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/enc-utf16.min.js"></script>
 	<script src="libs/enc-uint8array.min.js"></script>
 	<script src="libs/aes_crypt.min.js"></script>

diff --git a/demo/libs/aes_crypt.min.js b/demo/libs/aes_crypt.min.js
diff --git a/demo/worker.js b/demo/worker.js
@@ -3,11 +3,6 @@ let base_libs = "libs/";
 
 self.importScripts(
 	base_cdn + "core.min.js",
-	base_cdn + "cipher-core.min.js",
-	base_cdn + "aes.min.js",
-	base_cdn + "hmac.min.js",
-	base_cdn + "sha256.min.js",
-	base_cdn + "pad-nopadding.min.js",
 	base_cdn + "enc-utf16.min.js",
 	base_libs + "enc-uint8array.min.js",
 	base_libs + "aes_crypt.min.js",