Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-07 15:50:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Un-break PKCS5 (I inadvertently over-simplified setting the salt length).

Browse Source
This commit is contained in:
David Solin
2016-08-23 17:40:00 -05:00
parent e5ec84c06a
commit 733c19350c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java
View File

@@ -183,7 +183,7 @@ public class PKCS5KeyFile
} else { } else {
throw new FormatException("Not a supported algorithm: " + algorithm); throw new FormatException("Not a supported algorithm: " + algorithm);
} }
iv = Arrays.copyOfRange(DatatypeConverter.parseHexBinary(line.substring(ptr+1)), 0, Math.min(cipher.getIVSize(), 8)); iv = Arrays.copyOfRange(DatatypeConverter.parseHexBinary(line.substring(ptr+1)), 0, cipher.getIVSize());
} }
} else if (line.length() > 0) { } else if (line.length() > 0) {
sb.append(line); sb.append(line);
@@ -261,7 +261,7 @@ public class PKCS5KeyFile
md5.update(tmp, 0, tmp.length); md5.update(tmp, 0, tmp.length);
} }
md5.update(passphrase, 0, passphrase.length); md5.update(passphrase, 0, passphrase.length);
md5.update(iv, 0, iv.length); md5.update(iv, 0, iv.length > 8 ? 8 : iv.length);
tmp = md5.digest(); tmp = md5.digest();
System.arraycopy(tmp, 0, hn, i, tmp.length); System.arraycopy(tmp, 0, hn, i, tmp.length);
i += tmp.length; i += tmp.length;