me/no-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed encrypt/decryptByteStream to just enc/dec (overload consistency)

Browse Source
This commit is contained in:
Dave
2014-12-26 17:37:40 +02:00
parent ee72415e63
commit 7e2c130561
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nodash/core/NoUtil.java
View File

@@ -79,7 +79,7 @@ public final class NoUtil {
} }
} }
public static byte[] getPBEKeyFromPassword(char[] password) { private static byte[] getPBEKeyFromPassword(char[] password) {
SecretKeyFactory skf; SecretKeyFactory skf;
try { try {
skf = SecretKeyFactory.getInstance(NoUtil.PBE_TYPE); skf = SecretKeyFactory.getInstance(NoUtil.PBE_TYPE);
@@ -106,14 +106,14 @@ public final class NoUtil {
} }
} }
public static byte[] decryptByteArray(byte[] data, char[] password) throws IllegalBlockSizeException, BadPaddingException { public static byte[] decrypt(byte[] data, char[] password) throws IllegalBlockSizeException, BadPaddingException {
byte[] passwordByte = NoUtil.getPBEKeyFromPassword(password); byte[] passwordByte = NoUtil.getPBEKeyFromPassword(password);
byte[] response = NoUtil.decrypt(NoUtil.decrypt(data), passwordByte); byte[] response = NoUtil.decrypt(NoUtil.decrypt(data), passwordByte);
NoUtil.wipeBytes(passwordByte); NoUtil.wipeBytes(passwordByte);
return response; return response;
} }
public static byte[] encryptByteArray(byte[] data, char[] password) { public static byte[] encrypt(byte[] data, char[] password) {
byte[] passwordByte = NoUtil.getPBEKeyFromPassword(password); byte[] passwordByte = NoUtil.getPBEKeyFromPassword(password);
byte[] response = NoUtil.encrypt(NoUtil.encrypt(data, passwordByte)); byte[] response = NoUtil.encrypt(NoUtil.encrypt(data, passwordByte));
NoUtil.wipeBytes(passwordByte); NoUtil.wipeBytes(passwordByte);

4
src/nodash/models/NoUser.java
View File

@@ -87,7 +87,7 @@ public class NoUser implements Serializable {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos); ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(this); oos.writeObject(this);
byte[] encrypted = NoUtil.encryptByteArray(baos.toByteArray(), password); byte[] encrypted = NoUtil.encrypt(baos.toByteArray(), password);
oos.close(); oos.close();
baos.close(); baos.close();
return encrypted; return encrypted;
@@ -165,7 +165,7 @@ public class NoUser implements Serializable {
} }
public static NoUser createUserFromFile(byte[] data, char[] password) throws IllegalBlockSizeException, BadPaddingException, IOException, ClassNotFoundException { public static NoUser createUserFromFile(byte[] data, char[] password) throws IllegalBlockSizeException, BadPaddingException, IOException, ClassNotFoundException {
byte[] decrypted = NoUtil.decryptByteArray(data, password); byte[] decrypted = NoUtil.decrypt(data, password);
ByteArrayInputStream bais = new ByteArrayInputStream(decrypted); ByteArrayInputStream bais = new ByteArrayInputStream(decrypted);
ObjectInputStream ois = new ObjectInputStream(bais); ObjectInputStream ois = new ObjectInputStream(bais);
NoUser noUser = (NoUser) ois.readObject(); NoUser noUser = (NoUser) ois.readObject();