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

Updated NoSession to use newest NoHashSphere changes

Browse Source
This commit is contained in:
Dave
2014-12-21 00:33:28 +02:00
parent ffe8531824
commit 902a00d625
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodash/models/NoSession.java
View File

@@ -8,8 +8,8 @@ import java.util.UUID;
import javax.crypto.BadPaddingException; import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException; import javax.crypto.IllegalBlockSizeException;
import nodash.core.NoCore;
import nodash.core.NoUtil; import nodash.core.NoUtil;
import nodash.core.spheres.NoHashSphere;
import nodash.exceptions.NoByteSetBadDecryptionException; import nodash.exceptions.NoByteSetBadDecryptionException;
import nodash.exceptions.NoDashFatalException; import nodash.exceptions.NoDashFatalException;
import nodash.exceptions.NoDashSessionBadUUIDException; import nodash.exceptions.NoDashSessionBadUUIDException;
@@ -56,7 +56,7 @@ public final class NoSession implements Serializable {
char[] passwordDupe = password.clone(); char[] passwordDupe = password.clone();
try { try {
this.original = NoUser.createUserFromFile(data, password); this.original = NoUser.createUserFromFile(data, password);
if (NoHashSphere.checkHash(this.original.createHashString())) { if (NoCore.hashSphere.checkHash(this.original.createHashString())) {
this.current = NoUser.createUserFromFile(data, passwordDupe); this.current = NoUser.createUserFromFile(data, passwordDupe);
this.uuid = UUID.randomUUID(); this.uuid = UUID.randomUUID();
NoUtil.wipeBytes(data); NoUtil.wipeBytes(data);
@@ -136,14 +136,14 @@ public final class NoSession implements Serializable {
if (!this.newUserSession) { if (!this.newUserSession) {
/* 5.2.1: remove old hash from array */ /* 5.2.1: remove old hash from array */
try { try {
NoHashSphere.removeHash(this.original.createHashString()); NoCore.hashSphere.removeHash(this.original.createHashString());
} catch (IOException e) { } catch (IOException e) {
throw new NoDashFatalException("Unable to remove hash on confirm."); throw new NoDashFatalException("Unable to remove hash on confirm.");
} }
} }
/* 5.2.2: add new hash to array */ /* 5.2.2: add new hash to array */
try { try {
NoHashSphere.insertHash(this.current.createHashString()); NoCore.hashSphere.insertHash(this.current.createHashString());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
throw new NoDashFatalException("Unable to remove hash on confirm."); throw new NoDashFatalException("Unable to remove hash on confirm.");