Support bcrypt minor b

GluuFederation · Jun 13, 2024 · 606c6d6 · 606c6d6
1 parent 7477557
commit 606c6d6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java
@@ -679,7 +679,7 @@ public static String hashpw(String password, String salt) {
     }
     else {
       minor = salt.charAt(2);
-      if (minor != 'a' || salt.charAt(3) != '$') {
+      if (!((minor == 'a') || (minor == 'b')) || salt.charAt(3) != '$') {
         throw new IllegalArgumentException("Invalid salt revision");
       }
       off = 4;
@@ -745,7 +745,7 @@ public static String hashpw(byte[] password, String salt) {
     }
     else {
       minor = salt.charAt(2);
-      if (minor != 'a' || salt.charAt(3) != '$') {
+      if (!((minor == 'a') || (minor == 'b')) || salt.charAt(3) != '$') {
         throw new IllegalArgumentException("Invalid salt revision");
       }
       off = 4;