Conform to style

This commit is contained in:
Adrian 2015-11-10 00:49:47 +01:00
parent e63300e3a2
commit 52e27aa641
2 changed files with 14 additions and 26 deletions
src/main/java/org/mrpdaemon/sec/encfs

View file

@ -14,8 +14,7 @@ public class EncFSBinaryConfig
private EncFSBinaryConfig() { }
public static EncFSBinaryConfig from(EncFSConfig config)
throws IOException
{
throws IOException {
EncFSBinaryConfig obj = new EncFSBinaryConfig();
obj.config = config;
obj.encodedVolumeKey = EncFSBase64.decode(config.getBase64EncodedVolumeKey());
@ -25,28 +24,23 @@ public class EncFSBinaryConfig
return obj;
}
public EncFSConfig getConfig()
{
public EncFSConfig getConfig() {
return config;
}
public byte[] getEncodedVolumeKey()
{
public byte[] getEncodedVolumeKey() {
return encodedVolumeKey;
}
public byte[] getIvSeed()
{
public byte[] getIvSeed() {
return ivSeed;
}
public byte[] getEncryptedVolumeKey()
{
public byte[] getEncryptedVolumeKey() {
return encryptedVolumeKey;
}
public byte[] getSaltData()
{
public byte[] getSaltData() {
return saltData;
}
}

View file

@ -27,14 +27,12 @@ public class EncFSPBKDF2Data
private EncFSPBKDF2Data() { }
public static EncFSPBKDF2Data from(EncFSBinaryConfig config, String password)
throws InvalidKeySpecException
{
throws InvalidKeySpecException {
byte[] cipherSaltData = config.getSaltData();
int keySizeInBits = config.getConfig().getVolumeKeySizeInBits();
KeySpec ks = new PBEKeySpec(password.toCharArray(), cipherSaltData,
config.getConfig().getIterationForPasswordKeyDerivationCount(),
keySizeInBits + EncFSVolume.IV_LENGTH_IN_BYTES * 8
);
keySizeInBits + EncFSVolume.IV_LENGTH_IN_BYTES * 8);
byte[] pbkdf2Data = skf.generateSecret(ks).getEncoded();
EncFSPBKDF2Data obj;
@ -44,8 +42,7 @@ public class EncFSPBKDF2Data
}
public static EncFSPBKDF2Data from(EncFSConfig config, byte[] pbkdf2Data)
throws InvalidKeySpecException
{
throws InvalidKeySpecException {
EncFSPBKDF2Data obj = new EncFSPBKDF2Data();
int keySizeInBytes = config.getVolumeKeySizeInBits() / 8;
obj.pbkdf2Data = pbkdf2Data;
@ -56,22 +53,19 @@ public class EncFSPBKDF2Data
return obj;
}
public String getPassword()
{
public String getPassword() {
return password;
}
public byte[] getPbkdf2Data()
{
public byte[] getPbkdf2Data() {
return pbkdf2Data;
}
public byte[] getPassKeyData()
{
public byte[] getPassKeyData() {
return passKeyData;
}
public byte[] getPassIvData()
{
public byte[] getPassIvData() {
return passIvData;
}
}