keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-1.16' into master

This commit is contained in:
antelle 2020-12-10 20:35:28 +01:00
parent 513e258869 95c077a0ba
commit 211b058686
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/models/file-model.js
View File

@ -716,7 +716,9 @@ class FileModel extends Model {
}
static createKeyFileWithHash(hash) {
return kdbxweb.Credentials.createKeyFileWithHash(hash);
const hashData = kdbxweb.ByteUtils.base64ToBytes(hash);
const hexHash = kdbxweb.ByteUtils.bytesToHex(hashData);
return kdbxweb.ByteUtils.stringToBytes(hexHash);
}
}

2
desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.16.2",
"version": "1.16.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
desktop/package.json
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.16.2",
"version": "1.16.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.16.2",
"version": "1.16.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.16.2",
"version": "1.16.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,

3
release-notes.md
View File

@ -1,5 +1,8 @@
Release notes
-------------
##### v1.16.3 (2020-12-10)
`-` fix #1650: keyfiles stored in the app can't be used
##### v1.16.2 (2020-12-10)
`+` possibility to use V2 keyfiles (.keyx)
`-` fixed a missing icon in the local file question box