28074ee Fix PassphraseInfo signature checks.
src/sorcerersisle/cfpassphrase/Impl.java | 4 ++--
src/sorcerersisle/cfpassphrase/Utils.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sorcerersisle/cfpassphrase/Impl.java b/src/sorcerersisle/cfpassphrase/Impl.java
index 2086f64..74ae83a 100644
--- a/src/sorcerersisle/cfpassphrase/Impl.java
+++ b/src/sorcerersisle/cfpassphrase/Impl.java
@@ -186,7 +186,7 @@ public final class Impl
Parts = Hash.substring(1).split("\\$");
Info.put("Algorithm" , "SHA-2" );
- Info.put("Version" , Parts[0].equals(5) ? "256" : "512");
+ Info.put("Version" , Parts[0].equals("5") ? "256" : "512");
Info.put("Status" , "Unsupported" );
if ( Parts[1].startsWith("rounds=") )
@@ -210,7 +210,7 @@ public final class Impl
Info.put("Algorithm" , "SunMD5" );
Info.put("Status" , "Obsolete" );
- if ( Parts[1].startsWith("rounds=") )
+ if ( Parts[0].startsWith("rounds=") )
{
Info.put("Rounds" , Parts[0].split("=")[1] );
Info.put("Salt" , Parts[1] );
diff --git a/src/sorcerersisle/cfpassphrase/Utils.java b/src/sorcerersisle/cfpassphrase/Utils.java
index fa09c65..fa6d695 100644
--- a/src/sorcerersisle/cfpassphrase/Utils.java
+++ b/src/sorcerersisle/cfpassphrase/Utils.java
@@ -45,10 +45,10 @@ public final class Utils
else if ( Hash.matches("^\\$3\\$\\$[0-9A-Fa-f]{32}$") )
return Algorithm.unix_crypt_nthash;
- else if ( Hash.matches("^\\$5\\$(?:rounds=\\d{1,9}\\$)?[0-9A-Za-z./]{16}\\$[0-9A-Za-z./]{43}$") )
+ else if ( Hash.matches("^\\$5\\$(?:rounds=\\d{1,9}\\$)?[0-9A-Za-z./]{1,16}\\$[0-9A-Za-z./]{43}$") )
return Algorithm.unix_crypt_sha256;
- else if ( Hash.matches("^\\$6\\$(?:rounds=\\d{1,9}\\$)?[0-9A-Za-z./]{16}\\$[0-9A-Za-z./]{86}$") )
+ else if ( Hash.matches("^\\$6\\$(?:rounds=\\d{1,9}\\$)?[0-9A-Za-z./]{1,16}\\$[0-9A-Za-z./]{86}$") )
return Algorithm.unix_crypt_sha512;
else if ( Hash.matches("^\\$md5(?:[$,]rounds=\\d+)?\\$[./0-9A-Za-z]+\\$[./0-9A-Za-z]+$") )
