Skip to content

Update v0.15 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 6, 2021
Merged

Update v0.15 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bfc8cb1
Replaced HMAC & AES with WebCrypto subtle
Dead4W Jan 4, 2021
30040d7
minify aes_crypt.min.js
Dead4W Jan 4, 2021
5651831
go to WebCrypto Subtle (HMAC, SHA, AES)
Dead4W Jan 6, 2021
a82b655
README: removed depencies CryptoJS aes, hmac, sha256
Dead4W Jan 6, 2021
53a8026
removed progress callback
Dead4W Jan 6, 2021
76f42ae
README: removed progress_callback and fix utils
Dead4W Jan 6, 2021
eb48898
code distribution to files
Dead4W Jan 6, 2021
9400b14
Add comment Global for scrutinizer
Dead4W Jan 6, 2021
eba2c6e
Some fix for scrutinizer
Dead4W Jan 6, 2021
5d332fd
Merge pull request #2 from Dead4W/async
Dead4W Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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);
});
Expand Down
5 changes: 0 additions & 5 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demo/libs/aes_crypt.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions demo/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading