forked from I2P_Developers/i2p.i2p
log and javadoc tweaks
This commit is contained in:
@ -125,11 +125,17 @@ public class CryptixAESEngine extends AESEngine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param iv 16 bytes
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void decrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int length) {
|
public void decrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int length) {
|
||||||
decrypt(payload, payloadIndex, out, outIndex, sessionKey, iv, 0, length);
|
decrypt(payload, payloadIndex, out, outIndex, sessionKey, iv, 0, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param iv 16 bytes starting at ivOffset
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void decrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
|
public void decrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
|
||||||
if ((iv== null) || (payload == null) || (payload.length <= 0) || (sessionKey == null) )
|
if ((iv== null) || (payload == null) || (payload.length <= 0) || (sessionKey == null) )
|
||||||
|
@ -69,7 +69,7 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
|
|||||||
if (_data != null)
|
if (_data != null)
|
||||||
throw new RuntimeException("Data already set");
|
throw new RuntimeException("Data already set");
|
||||||
if (data != null && data.length != _length)
|
if (data != null && data.length != _length)
|
||||||
throw new IllegalArgumentException("Bad data length");
|
throw new IllegalArgumentException("Bad data length: " + data.length + "; required: " + _length);
|
||||||
_data = data;
|
_data = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,7 +141,8 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
|
|||||||
@Override
|
@Override
|
||||||
public void fromByteArray(byte data[]) throws DataFormatException {
|
public void fromByteArray(byte data[]) throws DataFormatException {
|
||||||
if (data == null) throw new DataFormatException("Null data passed in");
|
if (data == null) throw new DataFormatException("Null data passed in");
|
||||||
if (data.length != _length) throw new DataFormatException("Bad data length");
|
if (data.length != _length)
|
||||||
|
throw new DataFormatException("Bad data length: " + data.length + "; required: " + _length);
|
||||||
// call setData() instead of _data = data in case overridden
|
// call setData() instead of _data = data in case overridden
|
||||||
setData(data);
|
setData(data);
|
||||||
}
|
}
|
||||||
|
@ -47,9 +47,10 @@ class InboundEndpointProcessor {
|
|||||||
public boolean retrievePreprocessedData(byte orig[], int offset, int length, Hash prev) {
|
public boolean retrievePreprocessedData(byte orig[], int offset, int length, Hash prev) {
|
||||||
Hash last = _config.getPeer(_config.getLength()-2);
|
Hash last = _config.getPeer(_config.getLength()-2);
|
||||||
if (!last.equals(prev)) {
|
if (!last.equals(prev)) {
|
||||||
|
// shouldn't happen now that we have good dup ID detection in BuildHandler
|
||||||
if (_log.shouldLog(Log.ERROR))
|
if (_log.shouldLog(Log.ERROR))
|
||||||
_log.error("Invalid previous peer - attempted hostile loop? from " + prev
|
_log.error("Attempted IBEP injection from " + prev
|
||||||
+ ", expected " + last);
|
+ ", expected " + last);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user