luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-16 23:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructure the code in the Slot classes a bit

Browse source
This commit is contained in:
Alexander Bakker 2018-10-07 19:56:38 +02:00
parent 0434513820
commit 36907660e8
9 changed files with 120 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/me/impy/aegis/ui/tasks/DerivationTask.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import javax.crypto.SecretKey;
import me.impy.aegis.crypto.CryptoUtils;
import me.impy.aegis.crypto.SCryptParameters;
import me.impy.aegis.db.slots.PasswordSlot;
public class DerivationTask extends ProgressDialogTask<DerivationTask.Params, SecretKey> {
@ -21,7 +22,13 @@ public class DerivationTask extends ProgressDialogTask<DerivationTask.Params, Se
Params params = args[0];
byte[] salt = CryptoUtils.generateSalt();
return params.getSlot().deriveKey(params.getPassword(), salt, CryptoUtils.CRYPTO_SCRYPT_N, CryptoUtils.CRYPTO_SCRYPT_r, CryptoUtils.CRYPTO_SCRYPT_p);
SCryptParameters scryptParams = new SCryptParameters(
CryptoUtils.CRYPTO_SCRYPT_N,
CryptoUtils.CRYPTO_SCRYPT_r,
CryptoUtils.CRYPTO_SCRYPT_p,
salt
);
return params.getSlot().deriveKey(params.getPassword(), scryptParams);
}
@Override