diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js
index 6118a67f..18e80fc1 100644
--- a/app/scripts/models/file-model.js
+++ b/app/scripts/models/file-model.js
@@ -189,8 +189,10 @@ class FileModel extends Model {
if (uuid) {
uuid = kdbxweb.ByteUtils.bytesToBase64(uuid);
switch (uuid) {
- case kdbxweb.Consts.KdfId.Argon2:
- return 'Argon2';
+ case kdbxweb.Consts.KdfId.Argon2d:
+ return 'Argon2d';
+ case kdbxweb.Consts.KdfId.Argon2id:
+ return 'Argon2id';
case kdbxweb.Consts.KdfId.Aes:
return 'Aes';
}
@@ -212,7 +214,8 @@ class FileModel extends Model {
}
uuid = kdbxweb.ByteUtils.bytesToBase64(uuid);
switch (uuid) {
- case kdbxweb.Consts.KdfId.Argon2:
+ case kdbxweb.Consts.KdfId.Argon2d:
+ case kdbxweb.Consts.KdfId.Argon2id:
return {
parallelism: kdfParameters.get('P').valueOf(),
iterations: kdfParameters.get('I').valueOf(),
@@ -698,8 +701,11 @@ class FileModel extends Model {
case 'Aes':
this.db.setKdf(kdbxweb.Consts.KdfId.Aes);
break;
- case 'Argon2':
- this.db.setKdf(kdbxweb.Consts.KdfId.Argon2);
+ case 'Argon2d':
+ this.db.setKdf(kdbxweb.Consts.KdfId.Argon2d);
+ break;
+ case 'Argon2id':
+ this.db.setKdf(kdbxweb.Consts.KdfId.Argon2id);
break;
default:
throw new Error('Bad KDF name');
diff --git a/app/templates/settings/settings-file.hbs b/app/templates/settings/settings-file.hbs
index 044de7a0..28e78154 100644
--- a/app/templates/settings/settings-file.hbs
+++ b/app/templates/settings/settings-file.hbs
@@ -165,7 +165,8 @@
{{#if keyEncryptionRounds}}
diff --git a/package-lock.json b/package-lock.json
index 9d197028..a0f3d280 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9783,9 +9783,9 @@
}
},
"kdbxweb": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.10.0.tgz",
- "integrity": "sha512-wreNdagE2L1x2LWGWEZiHAVgqVzmGHkMmKENGIZb+gQ53HRTl8bgTJ/jddUiCuBaWA7KJHd8xcdxpk4djzwRFw==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.11.0.tgz",
+ "integrity": "sha512-8jhyAU+X8Kk9zsQobwMwx6wFI6XJyMrWuPWq+PcWaYwBW3l9ruN91FbRWbLSQvKku3IRLgpMgCIqiWBS/tQjCQ==",
"requires": {
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
"text-encoding": "github:keeweb/text-encoding#4dfb7cb0954c222852092f8b06ae4f6b4f60bfbb",
diff --git a/package.json b/package.json
index ee1ba349..f1ed3964 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
"jquery": "3.5.1",
"json-loader": "^0.5.7",
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
- "kdbxweb": "1.10.0",
+ "kdbxweb": "^1.11.0",
"load-grunt-tasks": "5.1.0",
"lodash": "^4.17.20",
"marked": "^1.2.5",
diff --git a/release-notes.md b/release-notes.md
index 30decf5e..6595fe36 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,6 +1,7 @@
Release notes
-------------
##### v1.16.1 (TBD)
+`+` Argon2id KDF support
`-` fix #1637: git commit in the About box
`-` fixed some design glitches