From 9a4b40914981a1e6d074ab53c22b043788eca753 Mon Sep 17 00:00:00 2001 From: jose Date: Thu, 29 Mar 2018 19:29:09 -0400 Subject: [PATCH] publish fixes and go to m11 --- build.sbt | 6 +++++- .../main/scala/tsec/cipher/symmetric/jca/AESCTR.scala | 11 ++++------- .../main/scala/tsec/cipher/symmetric/jca/AESGCM.scala | 2 -- .../scala/tsec/cipher/symmetric/jca/package.scala | 2 +- version.sbt | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 9f17e8c4..9e13d7c9 100644 --- a/build.sbt +++ b/build.sbt @@ -120,7 +120,7 @@ lazy val commonSettings = Seq( fork in run := true, parallelExecution in test := false, addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.5"), - version in ThisBuild := "0.0.1-M10", + version in ThisBuild := "0.0.1-M11", scalacOpts ) @@ -171,6 +171,7 @@ lazy val bouncyCastle = Project(id = "tsec-bouncy", base = file("bouncycastle")) .settings(commonSettings) .settings(bouncyLib) .settings(publishSettings) + .settings(releaseSettings) lazy val passwordHashers = Project(id = "tsec-password", base = file("password-hashers")) .settings(commonSettings) @@ -183,6 +184,7 @@ lazy val cipherCore = Project(id = "tsec-cipher-core", base = file("cipher-core" .settings(commonSettings) .settings(publishSettings) .dependsOn(common % "compile->compile;test->test") + .settings(releaseSettings) lazy val symmetricCipher = Project(id = "tsec-cipher-jca", base = file("cipher-symmetric")) .settings(commonSettings) @@ -190,6 +192,7 @@ lazy val symmetricCipher = Project(id = "tsec-cipher-jca", base = file("cipher-s .dependsOn(common % "compile->compile;test->test") .dependsOn(cipherCore) .settings(releaseSettings) + .settings(sources in (Compile, doc) := Seq.empty) lazy val mac = Project(id = "tsec-mac", base = file("mac")) .settings(commonSettings) @@ -229,6 +232,7 @@ lazy val jwtCore = Project(id = "tsec-jwt-core", base = file("jwt-core")) .settings(commonSettings) .settings(jwtCommonLibs) .settings(publishSettings) + .settings(releaseSettings) .dependsOn(common % "compile->compile;test->test") .dependsOn(mac) .dependsOn(signatures) diff --git a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESCTR.scala b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESCTR.scala index 06816a6d..8b924645 100644 --- a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESCTR.scala +++ b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESCTR.scala @@ -16,8 +16,6 @@ sealed abstract class AESCTR[A] extends JCACipherAPI[A, CTR, NoPadding] with AES /** Our default Iv strategy for CTR mode * produces randomized IVs * - * - * @return */ def defaultIvStrategy[F[_]: Sync](implicit c: BlockCipher[A]): IvGen[F, A] = JCAIvGen.random[F, A] @@ -30,14 +28,13 @@ sealed abstract class AESCTR[A] extends JCACipherAPI[A, CTR, NoPadding] with AES * For a 128 bit iv, we use a 64 bit leftmost bits as a nonce, * and the rightmost 64 bits (zeroed out) as the counter. * - * This means, using the `incremental` strategy, you can safely generate - * generate 2^64 - 10^6 different nonces maximum, each of which can safely increment - * a maximum of 2^64 blocks. + * This means, using the incremental strategy, you can safely generate + * generate 2^^64 - 10^^6 different nonces maximum, each of which can safely increment + * a maximum of 2^^64 blocks. * - * 2^64 - 10^6 is a safe limit to possibly avoid overflowing the safe number of nonces you can + * 2^^64 - 10^^6 is a safe limit to possibly avoid overflowing the safe number of nonces you can * generate with one key. * - * @return */ def incrementalIvStrategy[F[_]](implicit F: Sync[F]): CounterIvGen[F, A] = new CounterIvGen[F, A] { diff --git a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESGCM.scala b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESGCM.scala index 56bf73b3..bf11390d 100644 --- a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESGCM.scala +++ b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/AESGCM.scala @@ -16,8 +16,6 @@ sealed abstract class AESGCM[A] extends JCAAEAD[A, GCM, NoPadding] with AES[A] w /** Our default Iv strategy for GCM mode * produces randomized IVs * - * - * @return */ def defaultIvStrategy[F[_]: Sync](implicit c: AES[A]): IvGen[F, A] = GCM.randomIVStrategy[F, A] diff --git a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/package.scala b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/package.scala index 8715c35a..fc7379e3 100644 --- a/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/package.scala +++ b/cipher-symmetric/src/main/scala/tsec/cipher/symmetric/jca/package.scala @@ -122,7 +122,7 @@ package object jca extends CipherErrors { /** In our implementation, we will use the most secure tag size as defined * by: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf - * Iv length of 96 bits is recommended as per the spec on page 8 + * Iv length of 96 bits is recommended as per the spec on page 8 */ val NISTTagLengthBits = 128 val NISTIvLengthBytes = 12 diff --git a/version.sbt b/version.sbt index 5d440c9e..0a9006fb 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.0.1-M10" \ No newline at end of file +version in ThisBuild := "0.0.1-M11" \ No newline at end of file