From 02a8a6f8ef9e50512cbf8643f1dbe00be2a2bdda Mon Sep 17 00:00:00 2001
From: Jennyfb <jennyfb@stud.ntnu.no>
Date: Tue, 3 Mar 2020 12:24:41 +0100
Subject: [PATCH] Oppdateringer userDAO
---
src/main/java/dao/UserDAO.java | 10 ++++++----
src/test/java/UserDAOTest.java | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index 2dbad02..e4f8cc1 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,14 +183,16 @@ public class UserDAO {
* @return a random salt
*/
public byte[] generateSalt() {
+ byte[] bytes = new byte[16];
try{
- SecureRandom random = SecureRandom.getInstance("SHA-256");
- byte[] bytes = new byte[20];
+ SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+
random.nextBytes(bytes);
- return bytes;}
+ }
catch (NoSuchAlgorithmException e){
- return null;
+ e.printStackTrace();
}
+ return bytes;
}
/**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 9d8faca..ea85ca5 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -132,6 +132,7 @@ public class UserDAOTest extends JerseyTest {
}
}
+
@After
public void tearDown () {
try {
--
GitLab