summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java
diff options
context:
space:
mode:
authorSimon Rettberg2014-04-19 16:44:55 +0200
committerSimon Rettberg2014-04-19 16:44:55 +0200
commit494a977ab1004c480e60c57183be4e130372e72e (patch)
tree373f29a6967c91830e890e9b1ee878277008ee86 /src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java
parentAdd doc-comments to ApiServer and Hash, some TODO comments (diff)
downloadmasterserver-494a977ab1004c480e60c57183be4e130372e72e.tar.gz
masterserver-494a977ab1004c480e60c57183be4e130372e72e.tar.xz
masterserver-494a977ab1004c480e60c57183be4e130372e72e.zip
Added test case for sha512crypt, removed try/catch blocks from other tests, so they actually fail if something is wrong.
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java b/src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java
index 15cf9ac..bcd4b99 100644
--- a/src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java
+++ b/src/main/java/org/openslx/imagemaster/util/Sha512Crypt.java
@@ -449,7 +449,7 @@ public final class Sha512Crypt
* Drepper's C implementation.</p>
*/
- private static void selfTest()
+ public static void selfTest()
{
String msgs[] =
{
@@ -467,7 +467,6 @@ public final class Sha512Crypt
for (int t=0; t<(msgs.length/3); t++)
{
- String saltPrefix = msgs[t*3];
String plainText = msgs[t*3+1];
String cryptText = msgs[t*3+2];
@@ -483,6 +482,7 @@ public final class Sha512Crypt
else
{
System.out.println("Failed Crypt Badly");
+ throw new RuntimeException();
}
if (verifyPassword(plainText, cryptText))
@@ -492,6 +492,7 @@ public final class Sha512Crypt
else
{
System.out.println("Failed verifyPassword Badly");
+ throw new RuntimeException();
}
}
}