aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorCsaba Solya <csaba.solya@gmail.com>2018-02-23 17:09:16 +0800
committerCsaba Solya <csaba.solya@gmail.com>2018-02-23 17:09:16 +0800
commit73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c (patch)
treef072edc805fb8242beb9d1abcd95c517e06f8400 /app
parentc1aa59f6eddac0a37f0084e37ab1281e109d1c80 (diff)
downloadtangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar.gz
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar.bz2
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar.lz
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar.xz
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.tar.zst
tangerine-wallet-browser-73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c.zip
make keyFromPassword private
Diffstat (limited to 'app')
-rw-r--r--app/scripts/edge-encryptor.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js
index 9d6ac37b3..24c0c93a8 100644
--- a/app/scripts/edge-encryptor.js
+++ b/app/scripts/edge-encryptor.js
@@ -6,7 +6,7 @@ class EdgeEncryptor {
encrypt (password, dataObject) {
var salt = this._generateSalt()
- return this.keyFromPassword(password, salt)
+ return this._keyFromPassword(password, salt)
.then(function (key) {
var data = JSON.stringify(dataObject)
@@ -29,7 +29,7 @@ class EdgeEncryptor {
const payload = JSON.parse(text)
const salt = payload.salt
- return this.keyFromPassword(password, salt)
+ return this._keyFromPassword(password, salt)
.then(function (key) {
const encryptedData = Unibabel.base64ToBuffer(payload.data)
const vector = Unibabel.base64ToBuffer(payload.iv)
@@ -48,7 +48,7 @@ class EdgeEncryptor {
})
}
- keyFromPassword (password, salt) {
+ _keyFromPassword (password, salt) {
var passBuffer = Unibabel.utf8ToBuffer(password)
var saltBuffer = Unibabel.base64ToBuffer(salt)