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

Crypto: Move ChaChaCore from router to core, in prep for use with Encrypted LS2

Browse Source
This commit is contained in:
zzz
2019-02-19 16:00:47 +00:00
parent b3c5974693
commit 14ac8fe545
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@@ -828,7 +828,7 @@
additionalparam="-notimestamp"
doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
<group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*:com.southernstorm.noise.crypto.x25519" />
<group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*:com.southernstorm.noise.crypto.x25519:com.southernstorm.noise.crypto.chacha20" />
<group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
<group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.*:com.southernstorm.noise.*" />
<group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:net.i2p.router.sybil:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />

2
router/java/src/com/southernstorm/noise/crypto/ChaChaCore.java → core/java/src/com/southernstorm/noise/crypto/chacha20/ChaChaCore.java
View File

@@ -20,7 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
package com.southernstorm.noise.crypto;
package com.southernstorm.noise.crypto.chacha20;
/**
* Implementation of the ChaCha20 core hash transformation.

8
core/java/src/com/southernstorm/noise/crypto/chacha20/package.html Normal file
View File

@@ -0,0 +1,8 @@
<html><body>
<p>
Noise ChaCha20 primitive, moved from com.southernstorm.noise.crypto (in router)
to com.southernstorm.noise.crypto.chacha20 (in core) in 0.9.39.
</p><p>
Since 0.9.39.
</p>
</body></html>

2
router/java/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
View File

@@ -27,7 +27,7 @@ import java.util.Arrays;
import javax.crypto.BadPaddingException;
import javax.crypto.ShortBufferException;
import com.southernstorm.noise.crypto.ChaChaCore;
import com.southernstorm.noise.crypto.chacha20.ChaChaCore;
import com.southernstorm.noise.crypto.Poly1305;
/**