diff options
| author | Kenny Root <kenny@the-b.org> | 2008-08-26 05:10:04 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2008-08-26 05:10:04 +0000 |
| commit | c36f336e6f294313cdab84352b108beea4607e48 (patch) | |
| tree | c1114a0e6bb24a48e69fe80e03ad31f3e5bb8f4a /lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java | |
| parent | b4261695b2687ed43821ada65abe14d87604ba74 (diff) | |
| download | sshlib-c36f336e6f294313cdab84352b108beea4607e48.tar.gz sshlib-c36f336e6f294313cdab84352b108beea4607e48.tar.bz2 sshlib-c36f336e6f294313cdab84352b108beea4607e48.zip | |
Update Trilead SSH-2 for Java from build 211 to build 213
Diffstat (limited to 'lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java')
| -rw-r--r-- | lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java b/lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java index c6f1a4e..ac1b842 100644 --- a/lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java +++ b/lib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java @@ -15,12 +15,11 @@ import com.trilead.ssh2.crypto.digest.MD5; import com.trilead.ssh2.signature.DSAPrivateKey;
import com.trilead.ssh2.signature.RSAPrivateKey;
-
/**
* PEM Support.
*
* @author Christian Plattner, plattner@trilead.com
- * @version $Id: PEMDecoder.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $
+ * @version $Id: PEMDecoder.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $
*/
public class PEMDecoder
{
@@ -82,7 +81,8 @@ public class PEMDecoder while (true)
{
md5.update(password, 0, password.length);
- md5.update(salt, 0, 8); // ARGH we only use the first 8 bytes of the salt in this step.
+ md5.update(salt, 0, 8); // ARGH we only use the first 8 bytes of the
+ // salt in this step.
// This took me two hours until I got AES-xxx running.
int copy = (keyLen < tmp.length) ? keyLen : tmp.length;
@@ -317,7 +317,7 @@ public class PEMDecoder if (password == null)
throw new IOException("PEM is encrypted, but no password was specified");
- decryptPEM(ps, password.getBytes());
+ decryptPEM(ps, password.getBytes("ISO-8859-1"));
}
if (ps.pemType == PEM_DSA_PRIVATE_KEY)
|