diff options
author | Kenny Root <kenny@the-b.org> | 2015-12-26 00:22:28 -0600 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-12-26 00:22:28 -0600 |
commit | 3bc88faec1312f81e172f927151bd23408257d2c (patch) | |
tree | 20cb84b576ee22d1ce7cfd0a27efe098a0f8ce6d /sshlib/src/main/java/com/trilead/ssh2/crypto | |
parent | 39aef25501455b50fff7e0cb3ddf5399ab4bfc29 (diff) | |
parent | 065d92593af8bd43b47f016ebf6b4c1dd24fb769 (diff) | |
download | sshlib-3bc88faec1312f81e172f927151bd23408257d2c.tar.gz sshlib-3bc88faec1312f81e172f927151bd23408257d2c.tar.bz2 sshlib-3bc88faec1312f81e172f927151bd23408257d2c.zip |
Merge pull request #6 from kruton/unitTests
Unit tests
Diffstat (limited to 'sshlib/src/main/java/com/trilead/ssh2/crypto')
-rw-r--r-- | sshlib/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sshlib/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java b/sshlib/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java index ff8112a..beca5f7 100644 --- a/sshlib/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java +++ b/sshlib/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java @@ -68,7 +68,8 @@ public class SimpleDERReader return count; } - private int readLength() throws IOException + /* visible for testing */ + int readLength() throws IOException { int len = readByte() & 0xff; @@ -79,6 +80,8 @@ public class SimpleDERReader if (remain == 0) return -1; + else if (remain > 4) + return -1; len = 0; @@ -89,6 +92,9 @@ public class SimpleDERReader remain--; } + if (len < 0) + return -1; + return len; } |