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

Replaces instances of getBytes() in router classes

Browse Source
This commit is contained in:
z3r0fox
2015-12-20 01:26:33 +00:00
parent c60f3970d1
commit 2246e21340
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
router/java/test/junit/net/i2p/router/crypto/SessionEncryptionTest.java
View File

@ -46,7 +46,7 @@ public class SessionEncryptionTest extends TestCase{
SessionKeyManager skm = new TransientSessionKeyManager(_context);
SessionKey curKey = skm.createSession(pubKey);
byte[] msg = "msg 1".getBytes();
byte[] msg = DataHelper.getASCII("msg 1");
byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64);
byte dmsg[] = _context.elGamalAESEngine().decrypt(emsg, privKey, skm);
@ -60,7 +60,7 @@ public class SessionEncryptionTest extends TestCase{
SessionKeyManager skm = new TransientSessionKeyManager(_context);
SessionKey curKey = skm.createSession(pubKey);
byte[] msg = "msg 2".getBytes();
byte[] msg = DataHelper.getASCII("msg 2");
byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, 64);
byte dmsg[] = _context.elGamalAESEngine().decrypt(emsg, privKey, skm);
@ -95,11 +95,11 @@ public class SessionEncryptionTest extends TestCase{
secondTags.add(tag3);
secondTags.add(tag4);
byte[] msg1 = "msg 1".getBytes();
byte[] msg2 = "msg 2".getBytes();
byte[] msg3 = "msg 3".getBytes();
byte[] msg4 = "msg 4".getBytes();
byte[] msg5 = "msg 5".getBytes();
byte[] msg1 = DataHelper.getASCII("msg 1");
byte[] msg2 = DataHelper.getASCII("msg 2");
byte[] msg3 = DataHelper.getASCII("msg 3");
byte[] msg4 = DataHelper.getASCII("msg 4");
byte[] msg5 = DataHelper.getASCII("msg 5");
byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64);
@ -195,11 +195,11 @@ public class SessionEncryptionTest extends TestCase{
secondTags.add(tag3);
secondTags.add(tag4);
byte[] msg1 = "msg 1".getBytes();
byte[] msg2 = "msg 2".getBytes();
byte[] msg3 = "msg 3".getBytes();
byte[] msg4 = "msg 4".getBytes();
byte[] msg5 = "msg 5".getBytes();
byte[] msg1 = DataHelper.getASCII("msg 1");
byte[] msg2 = DataHelper.getASCII("msg 2");
byte[] msg3 = DataHelper.getASCII("msg 3");
byte[] msg4 = DataHelper.getASCII("msg 4");
byte[] msg5 = DataHelper.getASCII("msg 5");
byte emsg1[] = _context.elGamalAESEngine().encrypt(msg1, pubKey, curKey, firstTags, 64);
@ -291,7 +291,7 @@ public class SessionEncryptionTest extends TestCase{
if (i % 50 == 0)
nextKey = KeyGenerator.getInstance().generateSessionKey();
byte[] msg = ("msg " + i).getBytes();
byte[] msg = DataHelper.getASCII("msg " + i);
byte emsg[] = _context.elGamalAESEngine().encrypt(msg, pubKey, curKey, tags, curTag, nextKey, 64);

3
router/java/test/junit/net/i2p/router/transport/crypto/DHSessionKeyBuilderTest.java
View File

@ -13,6 +13,7 @@ import java.math.BigInteger;
import junit.framework.TestCase;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.data.SessionKey;
import net.i2p.util.RandomSource;
@ -40,7 +41,7 @@ public class DHSessionKeyBuilderTest extends TestCase {
String origVal = "1234567890123456"; // 16 bytes max using AESEngine
byte enc[] = new byte[16];
byte dec[] = new byte[16];
ctx.aes().encrypt(origVal.getBytes(), 0, enc, 0, key1, iv, 16);
ctx.aes().encrypt(DataHelper.getASCII(origVal), 0, enc, 0, key1, iv, 16);
ctx.aes().decrypt(enc, 0, dec, 0, key2, iv, 16);
String tranVal = new String(dec);
assertEquals(origVal, tranVal);