Skip to content

Commit 4a1312a

Browse files
Dead4WDead4W
authored
Merge pull request #1 from Dead4W/main
Update v0.15
2 parents dec3e0e + 5d332fd commit 4a1312a

File tree

8 files changed

+291
-305
lines changed

8 files changed

+291
-305
lines changed

‎README.md‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ Requirements
2121

2222
- CryptoJS (https://cryptojs.gitbook.io/docs/)
2323
- core.js
24-
- cipher-core.js
25-
- aes.js
26-
- hmac.js
27-
- sha256.js
28-
- pad-nopadding.js
2924
- enc-utf16.js
3025
- enc-uint8array.js (Custom Uint8Array encoding)
3126

@@ -39,25 +34,22 @@ const aes = AesCrypt();
3934

4035
let fileSecret = document.getElementById("fileSecret").files[0];
4136

42-
var password = "foopassword"
37+
let password = "foopassword"
4338

4439
// encryption/decryption
4540

46-
// **IMPORTANT** Only for workers!
47-
let progress_callback = (current) => {let percent = current * 100;};
48-
4941
// encrypt typed array (Uint8Array)
50-
aes.encrypt(fileSecret, password, progress_callback).then((encrypted) => {
42+
aes.encrypt(fileSecret, password).then((encrypted) => {
5143
console.log(encrypted);
5244
});
5345

5446
let fileEncrypted = document.getElementById("fileEncrypted").files[0];
5547

5648
// decrypt typed array (Uint8Array)
57-
aes.decrypt(fileEncrypted, password, progress_callback).then((decrypted) => {
49+
aes.decrypt(fileEncrypted, password).then((decrypted) => {
5850

5951
// transform Uint8Array to Latin1 string
60-
let secret = aes.utils.bytes_to_latin1(decrypted);
52+
let secret = aes.utils.bytes2str(decrypted);
6153

6254
console.log(secret);
6355
});

‎demo/index.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
<head>
33
<title></title>
44
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/core.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/cipher-core.min.js"></script>
6-
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/aes.min.js"></script>
7-
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/hmac.min.js"></script>
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/sha256.min.js"></script>
9-
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/pad-nopadding.min.js"></script>
105
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/enc-utf16.min.js"></script>
116
<script src="libs/enc-uint8array.min.js"></script>
127
<script src="libs/aes_crypt.min.js"></script>

‎demo/libs/aes_crypt.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/worker.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ let base_libs = "libs/";
33

44
self.importScripts(
55
base_cdn + "core.min.js",
6-
base_cdn + "cipher-core.min.js",
7-
base_cdn + "aes.min.js",
8-
base_cdn + "hmac.min.js",
9-
base_cdn + "sha256.min.js",
10-
base_cdn + "pad-nopadding.min.js",
116
base_cdn + "enc-utf16.min.js",
127
base_libs + "enc-uint8array.min.js",
138
base_libs + "aes_crypt.min.js",

0 commit comments

Comments
 (0)