echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SU3File: Fix getContentOffset(); fail on excess data after sig

Browse Source
This commit is contained in:
zzz
2014-12-14 15:52:44 +00:00
parent ba34c90b7f
commit d35363cdbc
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/src/net/i2p/crypto/SU3File.java
View File

@ -50,6 +50,7 @@ public class SU3File {
private String _version; private String _version;
private int _versionLength; private int _versionLength;
private String _signer; private String _signer;
private int _signatureLength;
private int _signerLength; private int _signerLength;
private int _fileType = -1; private int _fileType = -1;
private ContentType _contentType; private ContentType _contentType;
@ -265,16 +266,16 @@ public class SU3File {
// In verifyAndMigrate it reads this far then rewinds, but we don't need to here // In verifyAndMigrate it reads this far then rewinds, but we don't need to here
if (_sigType == null) if (_sigType == null)
throw new IOException("unknown sig type: " + sigTypeCode); throw new IOException("unknown sig type: " + sigTypeCode);
_signerLength = (int) DataHelper.readLong(in, 2); _signatureLength = (int) DataHelper.readLong(in, 2);
if (_signerLength != _sigType.getSigLen()) if (_signatureLength != _sigType.getSigLen())
throw new IOException("bad sig length"); throw new IOException("bad sig length");
skip(in, 1); skip(in, 1);
int _versionLength = in.read(); int _versionLength = in.read();
if (_versionLength < MIN_VERSION_BYTES) if (_versionLength < MIN_VERSION_BYTES)
throw new IOException("bad version length"); throw new IOException("bad version length");
skip(in, 1); skip(in, 1);
int signerLen = in.read(); _signerLength = in.read();
if (signerLen <= 0) if (_signerLength <= 0)
throw new IOException("bad signer length"); throw new IOException("bad signer length");
_contentLength = DataHelper.readLong(in, 8); _contentLength = DataHelper.readLong(in, 8);
if (_contentLength <= 0) if (_contentLength <= 0)
@ -302,9 +303,9 @@ public class SU3File {
} }
_version = new String(data, 0, zbyte, "UTF-8"); _version = new String(data, 0, zbyte, "UTF-8");
data = new byte[signerLen]; data = new byte[_signerLength];
bytesRead = DataHelper.read(in, data); bytesRead = DataHelper.read(in, data);
if (bytesRead != signerLen) if (bytesRead != _signerLength)
throw new EOFException(); throw new EOFException();
_signer = DataHelper.getUTF8(data); _signer = DataHelper.getUTF8(data);
@ -413,6 +414,9 @@ public class SU3File {
din.on(false); din.on(false);
Signature signature = new Signature(_sigType); Signature signature = new Signature(_sigType);
signature.readBytes(in); signature.readBytes(in);
int avail = in.available();
if (avail > 0)
throw new IOException(avail + " bytes data after sig");
SimpleDataStructure hash = _sigType.getHashInstance(); SimpleDataStructure hash = _sigType.getHashInstance();
hash.setData(sha); hash.setData(sha);
//System.out.println("hash\n" + HexDump.dump(sha)); //System.out.println("hash\n" + HexDump.dump(sha));