Skip to content

Commit 7a630f6

Browse files
committed
update dependencies.
1 parent 02d7cb6 commit 7a630f6

File tree

10 files changed

+179
-69
lines changed

10 files changed

+179
-69
lines changed

.idea/codeStyles/Project.xml

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.4.2
2+
3+
- Update dependencies. (archive, pointycastle)
4+
15
## 2.4.1
26

37
- Update dependencies.

example/pubspec.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
dependency: transitive
66
description:
77
name: archive
8-
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
8+
sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "3.6.1"
11+
version: "4.0.7"
1212
argon2_ffi_base:
1313
dependency: transitive
1414
description:
@@ -137,21 +137,13 @@ packages:
137137
url: "https://pub.dev"
138138
source: hosted
139139
version: "3.0.3+8"
140-
js:
141-
dependency: transitive
142-
description:
143-
name: js
144-
sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
145-
url: "https://pub.dev"
146-
source: hosted
147-
version: "0.7.2"
148140
kdbx:
149141
dependency: "direct main"
150142
description:
151143
path: ".."
152144
relative: true
153145
source: path
154-
version: "2.4.1"
146+
version: "2.4.2"
155147
lints:
156148
dependency: transitive
157149
description:
@@ -220,10 +212,18 @@ packages:
220212
dependency: transitive
221213
description:
222214
name: pointycastle
223-
sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
215+
sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5"
216+
url: "https://pub.dev"
217+
source: hosted
218+
version: "4.0.0"
219+
posix:
220+
dependency: transitive
221+
description:
222+
name: posix
223+
sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
224224
url: "https://pub.dev"
225225
source: hosted
226-
version: "3.9.1"
226+
version: "6.0.3"
227227
quiver:
228228
dependency: transitive
229229
description:

lib/kdbx.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/// dart library for reading keepass file format (kdbx).
2-
library kdbx;
2+
library;
33

44
export 'src/credentials/credentials.dart'
55
show Credentials, CredentialsPart, HashCredentials, PasswordCredentials;

lib/src/kdbx_format.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ class KdbxFormat {
10331033

10341034
static Uint8List _gzipDecode(Uint8List bytes) {
10351035
if (dartWebWorkaround) {
1036-
return GZipDecoder().decodeBytes(bytes) as Uint8List;
1036+
return GZipDecoder().decodeBytes(bytes);
10371037
}
10381038
return GZipCodec().decode(bytes) as Uint8List;
10391039
}

pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: kdbx
22
description: KeepassX format implementation in pure dart. (kdbx 3.x and 4.x support).
3-
version: 2.4.1
3+
version: 2.4.2
44
homepage: https://github.com/authpass/kdbx.dart
55

66
environment:
@@ -9,7 +9,7 @@ environment:
99
dependencies:
1010
logging: '>=0.11.3+2 <2.0.0'
1111
crypto: '>=2.0.0 <4.0.0'
12-
pointycastle: '>=3.4.0 <4.0.0'
12+
pointycastle: '>=3.4.0 <5.0.0'
1313
xml: '>=4.4.0 <7.0.0'
1414
uuid: ">=3.0.0 <5.0.0"
1515
meta: '>=1.0.0 <2.0.0'
@@ -18,7 +18,7 @@ dependencies:
1818
isolates: '>=3.0.0 <4.0.0'
1919
path: '>=1.6.0 <2.0.0'
2020
quiver: '>=2.1.0 <4.0.0'
21-
archive: '>=2.0.13 <4.0.0'
21+
archive: '>=2.0.13 <5.0.0'
2222
supercharged_dart: '>=1.2.0 <4.0.0'
2323
synchronized: '>=2.2.0 <4.0.0'
2424

@@ -30,6 +30,6 @@ dependencies:
3030
argon2_ffi_base: ^1.1.0+1
3131

3232
dev_dependencies:
33-
flutter_lints: '>=2.0.0 <4.0.0'
33+
flutter_lints: '>=2.0.0 <7.0.0'
3434
test: '>=1.6.0 <2.0.0'
3535
fake_async: ^1.2.0

test/deleted_objects_test.dart

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@Tags(['kdbx4'])
2+
library;
23

34
import 'package:kdbx/kdbx.dart';
45
import 'package:kdbx/src/kdbx_xml.dart';
@@ -16,8 +17,9 @@ void main() {
1617
_logger.finest('Running deleted objects tests.');
1718
group('read tombstones', () {
1819
test('load/save keeps deleted objects.', () async {
19-
final orig =
20-
await testUtil.readKdbxFile('test/test_files/tombstonetest.kdbx');
20+
final orig = await testUtil.readKdbxFile(
21+
'test/test_files/tombstonetest.kdbx',
22+
);
2123
expect(orig.body.deletedObjects, hasLength(1));
2224
final dt = orig.body.deletedObjects.first.deletionTime.get()!;
2325
expect([dt.year, dt.month, dt.day], [2020, 8, 30]);
@@ -52,8 +54,10 @@ void main() {
5254
final xml = file.body.generateXml(FakeProtectedSaltGenerator());
5355
final objects = xml.findAllElements(KdbxXml.NODE_DELETED_OBJECT);
5456
expect(objects.length, 1);
55-
expect(objects.first.findElements(KdbxXml.NODE_UUID).first.text,
56-
entry.uuid.uuid);
57+
expect(
58+
objects.first.findElements(KdbxXml.NODE_UUID).first.text,
59+
entry.uuid.uuid,
60+
);
5761
});
5862
test('delete group', () async {
5963
final file = testUtil.createEmptyFile();
@@ -72,8 +76,10 @@ void main() {
7276
final xml = file.body.generateXml(FakeProtectedSaltGenerator());
7377
final objects = xml.findAllElements(KdbxXml.NODE_DELETED_OBJECT);
7478
expect(objects.length, 4);
75-
expect(objects.map((e) => e.findElements(KdbxXml.NODE_UUID).first.text),
76-
objs.map((o) => o.uuid.uuid));
79+
expect(
80+
objects.map((e) => e.findElements(KdbxXml.NODE_UUID).first.text),
81+
objs.map((o) => o.uuid.uuid),
82+
);
7783
});
7884
});
7985
}

test/kdbx4_test.dart

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@Tags(['kdbx4'])
2+
library;
3+
24
import 'dart:io';
35

46
import 'package:kdbx/kdbx.dart';
@@ -22,15 +24,19 @@ void main() {
2224
test('bubb', () async {
2325
final data = await File('test/keepassxcpasswords.kdbx').readAsBytes();
2426
final file = await kdbxFormat.read(
25-
data, Credentials(ProtectedValue.fromString('asdf')));
27+
data,
28+
Credentials(ProtectedValue.fromString('asdf')),
29+
);
2630
final firstEntry = file.body.rootGroup.entries.first;
2731
final pwd = firstEntry.getString(KdbxKeyCommon.PASSWORD)!.getText();
2832
expect(pwd, 'MyPassword');
2933
});
3034
test('Reading kdbx4_keeweb', () async {
3135
final data = await File('test/kdbx4_keeweb.kdbx').readAsBytes();
3236
final file = await kdbxFormat.read(
33-
data, Credentials(ProtectedValue.fromString('asdf')));
37+
data,
38+
Credentials(ProtectedValue.fromString('asdf')),
39+
);
3440
final firstEntry = file.body.rootGroup.entries.first;
3541
final pwd = firstEntry.getString(KdbxKeyCommon.PASSWORD)!.getText();
3642
expect(pwd, 'def');
@@ -56,24 +62,32 @@ void main() {
5662
}
5763
});
5864
test('Binary Keyfile', () async {
59-
final data =
60-
await File('test/keyfile/BinaryKeyFilePasswords.kdbx').readAsBytes();
61-
final keyFile =
62-
await File('test/keyfile/binarykeyfile.key').readAsBytes();
63-
final file = await kdbxFormat.read(data,
64-
Credentials.composite(ProtectedValue.fromString('asdf'), keyFile));
65+
final data = await File(
66+
'test/keyfile/BinaryKeyFilePasswords.kdbx',
67+
).readAsBytes();
68+
final keyFile = await File(
69+
'test/keyfile/binarykeyfile.key',
70+
).readAsBytes();
71+
final file = await kdbxFormat.read(
72+
data,
73+
Credentials.composite(ProtectedValue.fromString('asdf'), keyFile),
74+
);
6575
expect(file.body.rootGroup.entries, hasLength(1));
6676
});
6777
test('Reading chacha20', () async {
6878
final data = await File('test/chacha20.kdbx').readAsBytes();
6979
final file = await kdbxFormat.read(
70-
data, Credentials(ProtectedValue.fromString('asdf')));
80+
data,
81+
Credentials(ProtectedValue.fromString('asdf')),
82+
);
7183
expect(file.body.rootGroup.entries, hasLength(1));
7284
});
7385
test('Reading aes-kdf', () async {
7486
final data = await File('test/aeskdf.kdbx').readAsBytes();
7587
final file = await kdbxFormat.read(
76-
data, Credentials(ProtectedValue.fromString('asdf')));
88+
data,
89+
Credentials(ProtectedValue.fromString('asdf')),
90+
);
7791
expect(file.body.rootGroup.entries, hasLength(1));
7892
}, skip: 'Takes tooo long, too many iterations.');
7993
});
@@ -91,20 +105,26 @@ void main() {
91105
final saved = await kdbx.save();
92106

93107
final loadedKdbx = await kdbxFormat.read(
94-
saved, Credentials(ProtectedValue.fromString('asdf')));
108+
saved,
109+
Credentials(ProtectedValue.fromString('asdf')),
110+
);
95111
_logger.fine('Successfully loaded kdbx $loadedKdbx');
96112
File('test_v4x.kdbx').writeAsBytesSync(saved);
97113
});
98114
test('Reading it', () async {
99115
final data = await File('test/test_v4x.kdbx').readAsBytes();
100116
final file = await kdbxFormat.read(
101-
data, Credentials(ProtectedValue.fromString('asdf')));
117+
data,
118+
Credentials(ProtectedValue.fromString('asdf')),
119+
);
102120
_logger.fine('successfully read ${file.body.rootGroup.name}');
103121
});
104122
test('write chacha20', () async {
105123
final data = await File('test/chacha20.kdbx').readAsBytes();
106124
final file = await kdbxFormat.read(
107-
data, Credentials(ProtectedValue.fromString('asdf')));
125+
data,
126+
Credentials(ProtectedValue.fromString('asdf')),
127+
);
108128
expect(file.body.rootGroup.entries, hasLength(1));
109129
_createEntry(file, file.body.rootGroup, 'user1', 'LoremIpsum');
110130

@@ -132,7 +152,11 @@ void main() {
132152
}
133153

134154
KdbxEntry _createEntry(
135-
KdbxFile file, KdbxGroup group, String username, String password) {
155+
KdbxFile file,
156+
KdbxGroup group,
157+
String username,
158+
String password,
159+
) {
136160
final entry = KdbxEntry.create(file, group);
137161
group.addEntry(entry);
138162
entry.setString(KdbxKeyCommon.USER_NAME, PlainValue(username));

0 commit comments

Comments
 (0)