This commit is contained in:
Sorunome 2020-05-23 17:05:55 +02:00
parent 280cd4fc16
commit 5fde85cbfa
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
1 changed files with 8 additions and 7 deletions

View File

@ -69,7 +69,8 @@ class SSSS {
}
}
var ciphertext = AES(Key(keys.aesKey), mode: AESMode.ctr, padding: null)
.encrypt(plain, iv: IV(iv)).bytes;
.encrypt(plain, iv: IV(iv))
.bytes;
if (bytesMissing != AES_BLOCKSIZE) {
// chop off those extra bytes again
ciphertext = ciphertext.sublist(0, plain.length - bytesMissing);
@ -104,12 +105,12 @@ class SSSS {
cipher[i] = oldCipher[i];
}
}
final decipher = AES(Key(keys.aesKey), mode: AESMode.ctr, padding: null).decrypt(
Encrypted(cipher),
iv: IV(base64.decode(data.iv)));
final decipher = AES(Key(keys.aesKey), mode: AESMode.ctr, padding: null)
.decrypt(Encrypted(cipher), iv: IV(base64.decode(data.iv)));
if (bytesMissing != AES_BLOCKSIZE) {
// chop off those extra bytes again
return String.fromCharCodes(decipher.sublist(0, decipher.length - bytesMissing));
return String.fromCharCodes(
decipher.sublist(0, decipher.length - bytesMissing));
}
return String.fromCharCodes(decipher);
}
@ -145,8 +146,8 @@ class SSSS {
throw 'Unknown algorithm';
}
final generator = PBKDF2(hashAlgorithm: sha512);
return Uint8List.fromList(generator.generateKey(
password, info.salt, info.iterations, info.bits != null ? info.bits / 8 : 32));
return Uint8List.fromList(generator.generateKey(password, info.salt,
info.iterations, info.bits != null ? info.bits / 8 : 32));
}
String get defaultKeyId {