bugfix: renamed bcrypt algo name so it's usable, refactored algo name handling

Author: lprimak

crypto/support/hashes/argon2/src/main/java/org/apache/shiro/crypto/support/hashes/argon2/Argon2Hash.java

@@ -90,7 +90,8 @@ class Argon2Hash extends AbstractCryptHash {
 
     private static final Logger LOG = LoggerFactory.getLogger(Argon2Hash.class);
 
-    private static final Set<String> ALGORITHMS_ARGON2 = new HashSet<>(Arrays.asList("argon2id", "argon2i", "argon2d"));
+    private static final Set<String> ALGORITHMS_ARGON2 = new HashSet<>(
+            Arrays.asList(DEFAULT_ALGORITHM_NAME, "argon2i", "argon2d"));
 
     private static final Pattern DELIMITER_COMMA = Pattern.compile(",");
 
@@ -227,7 +228,7 @@ public static Argon2Hash generate(
                 break;
             case "argon2":
                 // fall through
-            case "argon2id":
+            case DEFAULT_ALGORITHM_NAME:
                 type = Argon2Parameters.ARGON2_id;
                 break;
             default:

crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java

@@ -41,7 +41,7 @@
  */
 class BCryptHash extends AbstractCryptHash {
 
-    public static final String DEFAULT_ALGORITHM_NAME = "2y";
+    public static final String DEFAULT_ALGORITHM_NAME = "bcrypt2y";
 
     public static final int DEFAULT_COST = 10;
 
@@ -51,7 +51,8 @@ class BCryptHash extends AbstractCryptHash {
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractCryptHash.class);
 
-    private static final Set<String> ALGORITHMS_BCRYPT = new HashSet<>(Arrays.asList("2", "2a", "2b", "2y"));
+    private static final Set<String> ALGORITHMS_BCRYPT = new HashSet<>(
+            Arrays.asList("bcrypt2", "bcrypt2a", "bcrypt2b", DEFAULT_ALGORITHM_NAME));
 
     private final int cost;