Skip to content

Commit d93fd6d

Browse files
committed
chenged to accept and use also hashes that hav y/x as salt version, see https://en.wikipedia.org/wiki/Bcrypt
1 parent e015c2c commit d93fd6d

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

src/main/java/org/mindrot/BCrypt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ public static String hashpw(String password, String salt) {
662662
off = 3;
663663
else {
664664
minor = salt.charAt(2);
665-
if (minor != 'a' || salt.charAt(3) != '$')
665+
if ((minor != 'a' && minor != 'y' &&minor != 'x') || salt.charAt(3) != '$')
666666
throw new IllegalArgumentException ("Invalid salt revision");
667667
off = 4;
668668
}

src/test/java/org/mindrot/TestBCrypt.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,32 @@ public class TestBCrypt extends TestCase {
8383
{ "~!@#$%^&*() ~!@#$%^&*()PNBFRD",
8484
"$2a$12$WApznUOJfkEGSmYRfnkrPO",
8585
"$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC" },
86+
87+
{ "abc",
88+
"$2x$06$If6bvum7DFjUnE9p2uDeDu",
89+
"$2x$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i" },
90+
{ "abc",
91+
"$2x$08$Ro0CUfOqk6cXEKf3dyaM7O",
92+
"$2x$08$Ro0CUfOqk6cXEKf3dyaM7OhSCvnwM9s4wIX9JeLapehKK5YdLxKcm" },
93+
{ "abc",
94+
"$2x$10$WvvTPHKwdBJ3uk0Z37EMR.",
95+
"$2x$10$WvvTPHKwdBJ3uk0Z37EMR.hLA2W6N9AEBhEgrAOljy2Ae5MtaSIUi" },
96+
{ "abc",
97+
"$2x$12$EXRkfkdmXn2gzds2SSitu.",
98+
"$2x$12$EXRkfkdmXn2gzds2SSitu.MW9.gAVqa9eLS1//RYtYCmB1eLHg.9q" },
99+
100+
{ "a",
101+
"$2y$06$m0CrhHm10qJ3lXRY.5zDGO",
102+
"$2y$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe" },
103+
{ "a",
104+
"$2y$08$cfcvVd2aQ8CMvoMpP2EBfe",
105+
"$2y$08$cfcvVd2aQ8CMvoMpP2EBfeodLEkkFJ9umNEfPD18.hUF62qqlC/V." },
106+
{ "a",
107+
"$2y$10$k87L/MF28Q673VKh8/cPi.",
108+
"$2y$10$k87L/MF28Q673VKh8/cPi.SUl7MU/rWuSiIDDFayrKk/1tBsSQu4u" },
109+
{ "a",
110+
"$2y$12$8NJH3LsPrANStV6XtBakCe",
111+
"$2y$12$8NJH3LsPrANStV6XtBakCez0cKHXVxmvxIlcz785vxAIZrihHZpeS" },
86112
};
87113

88114
/**

0 commit comments

Comments
 (0)