From bb6f4d96b5c32ae49ca8041f5d7997004721c186 Mon Sep 17 00:00:00 2001
From: snegard <stiande@stud.ntnu.no>
Date: Tue, 3 Mar 2020 14:14:15 +0100
Subject: [PATCH] Kommerterte ut mer.
---
src/main/java/dao/UserDAO.java | 10 +++++-----
src/test/java/UserDAOTest.java | 10 ----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index ae78d78..a65d345 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,11 +183,11 @@ public class UserDAO {
* @return a random salt
*/
public byte[] generateSalt() {
- SecureRandom random = new SecureRandom();
- byte bytes[] = new byte[16];
- bytes = random.nextBytes(bytes);
-
- return bytes;
+ //SecureRandom random = new SecureRandom();
+ //byte bytes[] = new byte[16];
+ //bytes = random.nextBytes(bytes);
+ return null;
+ //return bytes;
}
/**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 170d031..9d8faca 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -194,14 +194,4 @@ public class UserDAOTest extends JerseyTest {
assertEquals(expectedUsername,actualUsername);
assertNotEquals(beforeNewUser,afterNewUser);
}
-
- /**
- @Test
- public void testSalt () {
- String password = "passord";
- byte salted1[] = userDAO.generateSalt(password);
- byte salted2[] = userDAO.generateSalt(password);
-
- assertNotEquals(salted1, salted2);
- }*/
}
\ No newline at end of file
--
GitLab