mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-15 04:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Use secp256k1-kmp (#1788)

Browse source 
* Use secp256k1-kmp

We get rid of our old JNI wrapper and switch to bitcoin-lib 0.18 which is based on secp256k1-kmp.
This will give us a consistent secp256k1 library on all our apps (since secp256k1-kmp also provides an Android library).
We also switch from spongycastle to bouncycastle (bitcoin-lib 0.18 uses bouncycastle).

* Set version to SNAPSHOT

Co-authored-by: dpad85 <5765435+dpad85@users.noreply.github.com>
This commit is contained in:
Fabrice Drouin 2021-05-07 19:59:56 +02:00 • committed by GitHub
parent cdb4b8a26f
commit 5dd5502d0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eclair-core/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>fr.acinq.eclair</groupId> <groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId> <artifactId>eclair_2.11</artifactId>
<version>0.4.2-android</version> <version>0.4.11-android-SNAPSHOT</version>
</parent> </parent>
<artifactId>eclair-core_2.11</artifactId> <artifactId>eclair-core_2.11</artifactId>

6
eclair-core/src/main/scala/fr/acinq/eclair/crypto/ChaCha20Poly1305.scala
View file

@ -22,8 +22,8 @@ import fr.acinq.bitcoin.{ByteVector32, Protocol}
import fr.acinq.eclair.crypto.ChaCha20Poly1305.{DecryptionError, EncryptionError, InvalidCounter} import fr.acinq.eclair.crypto.ChaCha20Poly1305.{DecryptionError, EncryptionError, InvalidCounter}
import grizzled.slf4j.Logger import grizzled.slf4j.Logger
import grizzled.slf4j.Logging import grizzled.slf4j.Logging
import org.spongycastle.crypto.engines.ChaCha7539Engine import org.bouncycastle.crypto.engines.ChaCha7539Engine
import org.spongycastle.crypto.params.{KeyParameter, ParametersWithIV} import org.bouncycastle.crypto.params.{KeyParameter, ParametersWithIV}
import scodec.bits.ByteVector import scodec.bits.ByteVector
/** /**
@ -39,7 +39,7 @@ object Poly1305 {
*/ */
def mac(key: ByteVector, datas: ByteVector*): ByteVector = { def mac(key: ByteVector, datas: ByteVector*): ByteVector = {
val out = new Array[Byte](16) val out = new Array[Byte](16)
val poly = new org.spongycastle.crypto.macs.Poly1305() val poly = new org.bouncycastle.crypto.macs.Poly1305()
poly.init(new KeyParameter(key.toArray)) poly.init(new KeyParameter(key.toArray))
datas.foreach(data => poly.update(data.toArray, 0, data.length.toInt)) datas.foreach(data => poly.update(data.toArray, 0, data.length.toInt))
poly.doFinal(out, 0) poly.doFinal(out, 0)

6
eclair-core/src/main/scala/fr/acinq/eclair/crypto/Mac.scala
View file

@ -17,9 +17,9 @@
package fr.acinq.eclair.crypto package fr.acinq.eclair.crypto
import fr.acinq.bitcoin.ByteVector32 import fr.acinq.bitcoin.ByteVector32
import org.spongycastle.crypto.digests.SHA256Digest import org.bouncycastle.crypto.digests.SHA256Digest
import org.spongycastle.crypto.macs.HMac import org.bouncycastle.crypto.macs.HMac
import org.spongycastle.crypto.params.KeyParameter import org.bouncycastle.crypto.params.KeyParameter
import scodec.bits.ByteVector import scodec.bits.ByteVector
/** /**

6
eclair-core/src/main/scala/fr/acinq/eclair/crypto/Noise.scala
View file

@ -23,9 +23,9 @@ import fr.acinq.bitcoin.Crypto.PrivateKey
import fr.acinq.bitcoin.{Crypto, Protocol} import fr.acinq.bitcoin.{Crypto, Protocol}
import fr.acinq.eclair.randomBytes import fr.acinq.eclair.randomBytes
import grizzled.slf4j.Logging import grizzled.slf4j.Logging
import org.spongycastle.crypto.digests.SHA256Digest import org.bouncycastle.crypto.digests.SHA256Digest
import org.spongycastle.crypto.macs.HMac import org.bouncycastle.crypto.macs.HMac
import org.spongycastle.crypto.params.KeyParameter import org.bouncycastle.crypto.params.KeyParameter
import scodec.bits.ByteVector import scodec.bits.ByteVector
/** /**

2
eclair-core/src/test/scala/fr/acinq/eclair/crypto/NoiseSpec.scala
View file

@ -18,7 +18,7 @@ package fr.acinq.eclair.crypto
import fr.acinq.eclair.crypto.Noise._ import fr.acinq.eclair.crypto.Noise._
import org.scalatest.funsuite.AnyFunSuite import org.scalatest.funsuite.AnyFunSuite
import org.spongycastle.crypto.ec.CustomNamedCurves import org.bouncycastle.crypto.ec.CustomNamedCurves
import scodec.bits._ import scodec.bits._

2
eclair-node/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>fr.acinq.eclair</groupId> <groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId> <artifactId>eclair_2.11</artifactId>
<version>0.4.2-android</version> <version>0.4.11-android-SNAPSHOT</version>
</parent> </parent>
<artifactId>eclair-node_2.11</artifactId> <artifactId>eclair-node_2.11</artifactId>

4
pom.xml
View file

@ -20,7 +20,7 @@
<groupId>fr.acinq.eclair</groupId> <groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId> <artifactId>eclair_2.11</artifactId>
<version>0.4.2-android</version> <version>0.4.11-android-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
@ -68,7 +68,7 @@
<akka.version>2.3.14</akka.version> <akka.version>2.3.14</akka.version>
<akka.http.version>10.0.11</akka.http.version> <akka.http.version>10.0.11</akka.http.version>
<sttp.version>1.3.9</sttp.version> <sttp.version>1.3.9</sttp.version>
<bitcoinlib.version>0.17</bitcoinlib.version> <bitcoinlib.version>0.18</bitcoinlib.version>
<guava.version>24.0-android</guava.version> <guava.version>24.0-android</guava.version>
<kamon.version>2.1.0</kamon.version> <kamon.version>2.1.0</kamon.version>
</properties> </properties>