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

Crypto: Move Curve25519 from router to core,

Browse Source 
in prep for new crypto
This commit is contained in:
zzz
2018-11-30 13:51:50 +00:00
parent a8bacd8727
commit cc4da1b4da
7 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE.txt
View File

@ -90,6 +90,10 @@ Public domain except as listed below:
(not included in most distribution packages) (not included in most distribution packages)
See licenses/LICENSE-Apache2.0.txt See licenses/LICENSE-Apache2.0.txt
Noise library:
Copyright (C) 2016 Southern Storm Software, Pty Ltd.
See licenses/LICENSE-Noise.txt
Router (router.jar): Router (router.jar):
Public domain except as listed below: Public domain except as listed below:

2
build.xml
View File

@ -825,7 +825,7 @@
additionalparam="-notimestamp" additionalparam="-notimestamp"
doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}" doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}"> 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.*" /> <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="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" /> <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" 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:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" /> <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />

4
router/java/src/com/southernstorm/noise/crypto/Curve25519.java → core/java/src/com/southernstorm/noise/crypto/x25519/Curve25519.java
View File

@ -20,7 +20,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
package com.southernstorm.noise.crypto; package com.southernstorm.noise.crypto.x25519;
import java.util.Arrays; import java.util.Arrays;
@ -34,6 +34,8 @@ import java.util.Arrays;
* representation instead of the 8/16/32-bit limbs in the original. * representation instead of the 8/16/32-bit limbs in the original.
* *
* References: http://cr.yp.to/ecdh.html, RFC 7748 * References: http://cr.yp.to/ecdh.html, RFC 7748
*
* @since 0.9.36 moved from router to core in 0.9.38
*/ */
public final class Curve25519 { public final class Curve25519 {

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

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

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

@ -25,7 +25,7 @@ package com.southernstorm.noise.protocol;
import java.security.KeyPair; import java.security.KeyPair;
import java.util.Arrays; import java.util.Arrays;
import com.southernstorm.noise.crypto.Curve25519; import com.southernstorm.noise.crypto.x25519.Curve25519;
import net.i2p.router.transport.crypto.X25519KeyFactory; import net.i2p.router.transport.crypto.X25519KeyFactory;

2
router/java/src/net/i2p/router/transport/crypto/X25519KeyFactory.java
View File

@ -3,7 +3,7 @@ package net.i2p.router.transport.crypto;
import java.security.KeyPair; import java.security.KeyPair;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import com.southernstorm.noise.crypto.Curve25519; import com.southernstorm.noise.crypto.x25519.Curve25519;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.util.I2PThread; import net.i2p.util.I2PThread;

2
router/java/src/net/i2p/router/transport/crypto/X25519PrivateKey.java
View File

@ -2,7 +2,7 @@ package net.i2p.router.transport.crypto;
import java.security.PrivateKey; import java.security.PrivateKey;
import com.southernstorm.noise.crypto.Curve25519; import com.southernstorm.noise.crypto.x25519.Curve25519;
/** /**
* A PrivateKey we can stick in a KeyPair. * A PrivateKey we can stick in a KeyPair.