1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
Description: using a replacement BCrypt implementation, which is Debian-packaged
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2022-01-08
@@ -20,8 +20,9 @@
package megan.ms;
-import at.favre.lib.crypto.bcrypt.BCrypt;
-import jloda.util.Basic;
+//import at.favre.lib.crypto.bcrypt.BCrypt;
+import org.mindrot.jbcrypt.BCrypt;
+//import jloda.util.Basic;
import megan.daa.connector.ClassificationBlockDAA;
import megan.daa.io.ByteInputStream;
import megan.daa.io.ByteOutputStream;
@@ -124,10 +125,12 @@
}
public static String computeBCryptHash(byte[] password) {
- return Basic.toString(BCrypt.withDefaults().hash(6, SALT, password));
+ //return Basic.toString(BCrypt.withDefaults().hash(6, SALT, password));
+ return BCrypt.hashpw(new String(password), BCrypt.gensalt(6));
}
public static boolean verify (char[] password,String bcryptHash) {
- return BCrypt.verifyer().verify(password,bcryptHash).verified;
+ //return BCrypt.verifyer().verify(password,bcryptHash).verified;
+ return BCrypt.checkpw(new String(password), bcryptHash);
}
}
|
