Merge "Update notes about password security"

[gigi.git] / tests / com / lambdaworks / crypto / test / SCryptTest.java

diff --git a/tests/com/lambdaworks/crypto/test/SCryptTest.java b/tests/com/lambdaworks/crypto/test/SCryptTest.java
index bd34bb2efae9f9dc0e9493c0ac0b9d870ffadfae..fe2242f0b9eec5b7da879613689c2b9ab2499bec 100644 (file)
--- a/tests/com/lambdaworks/crypto/test/SCryptTest.java
+++ b/tests/com/lambdaworks/crypto/test/SCryptTest.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
+// Copyright (C) 2011 - Will Glozer. All rights reserved.
 
 package com.lambdaworks.crypto.test;
 
@@ -10,6 +10,7 @@ import static com.lambdaworks.crypto.test.CryptoTestUtil.*;
 import static com.lambdaworks.crypto.SCrypt.*;
 
 public class SCryptTest {
+
     @Test
     public void scrypt_paper_appendix_b() throws Exception {
         byte[] P, S;
@@ -67,18 +68,18 @@ public class SCryptTest {
     public void scrypt_invalid_N_large() throws Exception {
         byte[] P = "pleaseletmein".getBytes("UTF-8");
         byte[] S = "SodiumChloride".getBytes("UTF-8");
-        int    r = 8;
-        int    N = Integer.MAX_VALUE / 128;
+        int r = 8;
+        int N = Integer.MAX_VALUE / 128;
         scrypt(P, S, N, r, 1, 64);
     }
 
-//    @Test(expected = IllegalArgumentException.class)
-//    public void scrypt_invalid_r_large() throws Exception {
-//        byte[] P = "pleaseletmein".getBytes("UTF-8");
-//        byte[] S = "SodiumChloride".getBytes("UTF-8");
-//        int    N = 1024;
-//        int    r = Integer.MAX_VALUE / 128 + 1;
-//        int    p = 0;
-//        scrypt(P, S, N, r, p, 64);
-//    }
+    // @Test(expected = IllegalArgumentException.class)
+    // public void scrypt_invalid_r_large() throws Exception {
+    // byte[] P = "pleaseletmein".getBytes("UTF-8");
+    // byte[] S = "SodiumChloride".getBytes("UTF-8");
+    // int N = 1024;
+    // int r = Integer.MAX_VALUE / 128 + 1;
+    // int p = 0;
+    // scrypt(P, S, N, r, p, 64);
+    // }
 }