infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Move the 'signing key' code for BAR into common-hash

pull/1/head
yflory 2020-07-09 17:09:52 +02:00
parent 0f81f96259
commit 476d968660
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/common-hash.js
View File

@ -28,6 +28,13 @@ var factory = function (Util, Crypto, Keys, Nacl) {
}; };
}; };
Hash.getSignPublicFromPrivate = function (edPrivateSafeStr) {
var edPrivateStr = Crypto.b64AddSlashes(edPrivateSafeStr);
var privateKey = Nacl.util.decodeBase64(edPrivateStr);
var keyPair = Nacl.sign.keyPair.fromSecretKey(privateKey);
return Nacl.util.encodeBase64(keyPair.publicKey);
};
var getEditHashFromKeys = Hash.getEditHashFromKeys = function (secret) { var getEditHashFromKeys = Hash.getEditHashFromKeys = function (secret) {
var version = secret.version; var version = secret.version;
var data = secret.keys; var data = secret.keys;

5
www/common/sframe-common-outer.js
View File

@ -384,10 +384,7 @@ define([
// This is a burn after reading URL: make sure our owner key is still valid // This is a burn after reading URL: make sure our owner key is still valid
try { try {
var nacl = window.nacl; var publicKey = Utils.Hash.getSignPublicFromPrivate(burnAfterReading);
var key = nacl.util.decodeBase64(Crypto.b64AddSlashes(burnAfterReading));
var kp = nacl.sign.keyPair.fromSecretKey(key);
var publicKey = nacl.util.encodeBase64(kp.publicKey);
Cryptpad.getPadMetadata({ Cryptpad.getPadMetadata({
channel: secret.channel channel: secret.channel
}, waitFor(function (md) { }, waitFor(function (md) {