mirror of https://github.com/schollz/croc.git
update
This commit is contained in:
parent
7279a9014c
commit
b3319e8f39
|
@ -45,7 +45,7 @@
|
||||||
var reader = new FileReader();
|
var reader = new FileReader();
|
||||||
|
|
||||||
// If we use onloadend, we need to check the readyState.
|
// If we use onloadend, we need to check the readyState.
|
||||||
reader.onloadend = function (evt) {
|
reader.onloadend = function(evt) {
|
||||||
if (evt.target.readyState == FileReader.DONE) { // DONE == 2
|
if (evt.target.readyState == FileReader.DONE) { // DONE == 2
|
||||||
document.getElementById('byte_content').textContent = evt.target.result;
|
document.getElementById('byte_content').textContent = evt.target.result;
|
||||||
document.getElementById('byte_range').textContent = ['Read bytes: ', start + 1, ' - ', stop + 1,
|
document.getElementById('byte_range').textContent = ['Read bytes: ', start + 1, ' - ', stop + 1,
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
reader.readAsBinaryString(blob);
|
reader.readAsBinaryString(blob);
|
||||||
}
|
}
|
||||||
|
|
||||||
document.querySelector('.readBytesButtons').addEventListener('click', function (evt) {
|
document.querySelector('.readBytesButtons').addEventListener('click', function(evt) {
|
||||||
if (evt.target.tagName.toLowerCase() == 'button') {
|
if (evt.target.tagName.toLowerCase() == 'button') {
|
||||||
var startByte = evt.target.getAttribute('data-startbyte');
|
var startByte = evt.target.getAttribute('data-startbyte');
|
||||||
var endByte = evt.target.getAttribute('data-endbyte');
|
var endByte = evt.target.getAttribute('data-endbyte');
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
}
|
}
|
||||||
if (data.Message == "pake") {
|
if (data.Message == "pake") {
|
||||||
log("processing pake data");
|
log("processing pake data");
|
||||||
// console.log(pakeData);
|
console.log(data);
|
||||||
pakeData = pakeUpdate(pakeData, data.Payload);
|
pakeData = pakeUpdate(pakeData, data.Payload);
|
||||||
console.log(pakeSessionKey(pakeData));
|
console.log(pakeSessionKey(pakeData));
|
||||||
sendMessage({
|
sendMessage({
|
||||||
|
|
|
@ -30,6 +30,7 @@ import (
|
||||||
"syscall/js"
|
"syscall/js"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
log "github.com/schollz/logger"
|
||||||
"github.com/schollz/pake/v2"
|
"github.com/schollz/pake/v2"
|
||||||
"golang.org/x/crypto/pbkdf2"
|
"golang.org/x/crypto/pbkdf2"
|
||||||
)
|
)
|
||||||
|
@ -211,6 +212,7 @@ func pakeUpdate(this js.Value, inputs []js.Value) interface{} {
|
||||||
|
|
||||||
b, err := base64.StdEncoding.DecodeString(inputs[0].String())
|
b, err := base64.StdEncoding.DecodeString(inputs[0].String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Errorf("problem with %s: %s", inputs[0].String(), err)
|
||||||
return js.Global().Get("Error").New(err.Error())
|
return js.Global().Get("Error").New(err.Error())
|
||||||
}
|
}
|
||||||
err = json.Unmarshal(b, &P)
|
err = json.Unmarshal(b, &P)
|
||||||
|
@ -221,6 +223,7 @@ func pakeUpdate(this js.Value, inputs []js.Value) interface{} {
|
||||||
|
|
||||||
b, err = base64.StdEncoding.DecodeString(inputs[1].String())
|
b, err = base64.StdEncoding.DecodeString(inputs[1].String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Errorf("problem with %s: %s", inputs[1].String(), err)
|
||||||
return js.Global().Get("Error").New(err.Error())
|
return js.Global().Get("Error").New(err.Error())
|
||||||
}
|
}
|
||||||
err = json.Unmarshal(b, &Q)
|
err = json.Unmarshal(b, &Q)
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue