fluencelabs/crypto
1
0
Fork 0
mirror of https://github.com/fluencelabs/crypto synced 2025-04-25 06:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Slogging dependency is kept only in keystore (#7)

Browse Source
This commit is contained in:
Dmitry Kurinskiy 2019-06-13 15:28:05 +03:00 committed by GitHub
parent 1a8313b321
commit 38608df192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -14,7 +14,7 @@ val scalaV = scalaVersion := "2.12.8"
val commons = Seq( val commons = Seq(
scalaV, scalaV,
version := "0.0.5", version := "0.0.6",
fork in Test := true, fork in Test := true,
parallelExecution in Test := false, parallelExecution in Test := false,
organization := "one.fluence", organization := "one.fluence",
@ -104,7 +104,7 @@ lazy val `crypto-hashsign` = crossProject(JVMPlatform, JSPlatform)
) )
.jsSettings( .jsSettings(
npmDependencies in Compile ++= Seq( npmDependencies in Compile ++= Seq(
"elliptic" -> "6.4.0" "elliptic" -> "6.4.1"
), ),
scalaJSModuleKind in Test := ModuleKind.CommonJSModule, scalaJSModuleKind in Test := ModuleKind.CommonJSModule,
//all JavaScript dependencies will be concatenated to a single file *-jsdeps.js //all JavaScript dependencies will be concatenated to a single file *-jsdeps.js
@ -125,7 +125,7 @@ lazy val `crypto-cipher` = crossProject(JVMPlatform, JSPlatform)
.settings( .settings(
commons, commons,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"biz.enef" %%% "slogging" % SloggingV, "biz.enef" %%% "slogging" % SloggingV % Test,
"org.scalatest" %%% "scalatest" % ScalatestV % Test "org.scalatest" %%% "scalatest" % ScalatestV % Test
) )
) )

2
cipher/js/src/main/scala/fluence/crypto/aes/AesCrypt.scala
View File

@ -127,7 +127,7 @@ class AesCrypt(password: Array[Char], withIV: Boolean, config: AesConfig) {
} }
} }
object AesCrypt extends slogging.LazyLogging { object AesCrypt {
def build(password: ByteVector, withIV: Boolean, config: AesConfig): Crypto.Cipher[Array[Byte]] = { def build(password: ByteVector, withIV: Boolean, config: AesConfig): Crypto.Cipher[Array[Byte]] = {
val aes = new AesCrypt(password.toHex.toCharArray, withIV, config) val aes = new AesCrypt(password.toHex.toCharArray, withIV, config)

2
cipher/jvm/src/main/scala/fluence/crypto/aes/AesCrypt.scala
View File

@ -220,7 +220,7 @@ class AesCrypt(password: Array[Char], withIV: Boolean, config: AesConfig) extend
} }
} }
object AesCrypt extends slogging.LazyLogging { object AesCrypt {
def build(password: ByteVector, withIV: Boolean, config: AesConfig): Crypto.Cipher[Array[Byte]] = { def build(password: ByteVector, withIV: Boolean, config: AesConfig): Crypto.Cipher[Array[Byte]] = {
val aes = new AesCrypt(password.toHex.toCharArray, withIV, config) val aes = new AesCrypt(password.toHex.toCharArray, withIV, config)

1
hashsign/js/src/test/scala/fluence/crypto/EcdsaSpec.scala
View File

@ -21,7 +21,6 @@ import cats.data.EitherT
import cats.instances.try_._ import cats.instances.try_._
import fluence.crypto.ecdsa.Ecdsa import fluence.crypto.ecdsa.Ecdsa
import fluence.crypto.signature.Signature import fluence.crypto.signature.Signature
import fluence.crypto.{CryptoError, KeyPair}
import org.scalatest.{Matchers, WordSpec} import org.scalatest.{Matchers, WordSpec}
import scodec.bits.ByteVector import scodec.bits.ByteVector

2
hashsign/jvm/src/main/scala/fluence/crypto/ecdsa/Ed25519.scala → hashsign/jvm/src/main/scala/fluence/crypto/eddsa/Ed25519.scala
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package fluence.crypto.ecdsa package fluence.crypto.eddsa
import java.security._ import java.security._

2
hashsign/jvm/src/test/scala/fluence/crypto/Ed25519Spec.scala
View File

@ -21,7 +21,7 @@ import java.io.File
import cats.data.EitherT import cats.data.EitherT
import cats.instances.try_._ import cats.instances.try_._
import fluence.crypto.ecdsa.Ed25519 import fluence.crypto.eddsa.Ed25519
import fluence.crypto.keystore.FileKeyStorage import fluence.crypto.keystore.FileKeyStorage
import fluence.crypto.signature.Signature import fluence.crypto.signature.Signature
import org.scalatest.{Matchers, WordSpec} import org.scalatest.{Matchers, WordSpec}