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

* Random: Use new nextBytes(buf, off, len) for efficiency

Browse Source
This commit is contained in:
zzz
2011-11-29 13:54:19 +00:00
parent 8480788856
commit d3564dfcb5
6 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/data/i2np/BuildRequestRecord.java
View File

@ -253,9 +253,7 @@ public class BuildRequestRecord {
truncatedHour /= (60l*60l*1000l);
DataHelper.toLong(buf, OFF_REQ_TIME, 4, truncatedHour);
DataHelper.toLong(buf, OFF_SEND_MSG_ID, 4, nextMsgId);
byte rnd[] = new byte[PADDING_SIZE];
ctx.random().nextBytes(rnd);
System.arraycopy(rnd, 0, buf, OFF_SEND_MSG_ID+4, rnd.length);
ctx.random().nextBytes(buf, OFF_SEND_MSG_ID+4, PADDING_SIZE);
byte wroteIV[] = readReplyIV();
if (!DataHelper.eq(iv, wroteIV))

2
router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
View File

@ -356,6 +356,7 @@ class ProfilePersistenceHelper {
}
/** generate 1000 profiles */
/****
public static void main(String args[]) {
System.out.println("Generating 1000 profiles");
File dir = new File("profiles");
@ -373,4 +374,5 @@ class ProfilePersistenceHelper {
}
System.out.println("1000 peers created in " + dir.getAbsolutePath());
}
****/
}

15
router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
View File

@ -241,14 +241,12 @@ class EstablishState {
System.arraycopy(_Y, 0, xy, _X.length, _Y.length);
Hash hxy = _context.sha().calculateHash(xy);
_tsB = (_context.clock().now() + 500) / 1000l; // our (Bob's) timestamp in seconds
byte padding[] = new byte[12]; // the encrypted data needs an extra 12 bytes
_context.random().nextBytes(padding);
byte toEncrypt[] = new byte[hxy.getData().length+4+padding.length];
byte toEncrypt[] = new byte[hxy.getData().length + (4 + 12)];
System.arraycopy(hxy.getData(), 0, toEncrypt, 0, hxy.getData().length);
byte tsB[] = DataHelper.toLong(4, _tsB);
System.arraycopy(tsB, 0, toEncrypt, hxy.getData().length, tsB.length);
//DataHelper.toLong(toEncrypt, hxy.getData().length, 4, _tsB);
System.arraycopy(padding, 0,toEncrypt, hxy.getData().length+4, padding.length);
_context.random().nextBytes(toEncrypt, hxy.getData().length + 4, 12);
if (_log.shouldLog(Log.DEBUG)) {
//_log.debug(prefix()+"Y="+Base64.encode(_Y));
//_log.debug(prefix()+"x+y="+Base64.encode(xy));
@ -453,9 +451,8 @@ class EstablishState {
DataHelper.toLong(preEncrypt, 0, 2, ident.length);
System.arraycopy(ident, 0, preEncrypt, 2, ident.length);
DataHelper.toLong(preEncrypt, 2+ident.length, 4, _tsA);
byte pad[] = new byte[padding];
_context.random().nextBytes(pad);
System.arraycopy(pad, 0, preEncrypt, 2+ident.length+4, padding);
if (padding > 0)
_context.random().nextBytes(preEncrypt, 2 + ident.length + 4, padding);
System.arraycopy(sig.getData(), 0, preEncrypt, 2+ident.length+4+padding, Signature.SIGNATURE_BYTES);
_prevEncrypted = new byte[preEncrypt.length];
@ -681,10 +678,8 @@ class EstablishState {
Signature sig = _context.dsa().sign(toSign, _context.keyManager().getSigningPrivateKey());
byte preSig[] = new byte[Signature.SIGNATURE_BYTES+8];
byte pad[] = new byte[8];
_context.random().nextBytes(pad);
System.arraycopy(sig.getData(), 0, preSig, 0, Signature.SIGNATURE_BYTES);
System.arraycopy(pad, 0, preSig, Signature.SIGNATURE_BYTES, pad.length);
_context.random().nextBytes(preSig, Signature.SIGNATURE_BYTES, 8);
_e_bobSig = new byte[preSig.length];
_context.aes().encrypt(preSig, 0, _e_bobSig, 0, _dh.getSessionKey(), _e_hXY_tsB, _e_hXY_tsB.length-16, _e_bobSig.length);

6
router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
View File

@ -101,7 +101,6 @@ class PacketBuilder {
private static final ByteCache _ivCache = ByteCache.getInstance(64, UDPPacket.IV_SIZE);
private static final ByteCache _hmacCache = ByteCache.getInstance(64, Hash.HASH_LENGTH);
private static final ByteCache _blockCache = ByteCache.getInstance(64, 16);
/**
* For debugging and stats only - does not go out on the wire.
@ -280,10 +279,7 @@ class PacketBuilder {
// pad up so we're on the encryption boundary
int padSize = 16 - (off % 16);
if (padSize > 0) {
ByteArray block = _blockCache.acquire();
_context.random().nextBytes(block.getData());
System.arraycopy(block.getData(), 0, data, off, padSize);
_blockCache.release(block);
_context.random().nextBytes(data, off, padSize);
off += padSize;
}
packet.getPacket().setLength(off);