refactor: clean up domain

Author: sander

src/main/kotlin/AssociatedData.kt

@@ -1,16 +1,10 @@
 package nl.sanderdijkhuis.noise
 
 @JvmInline
-value class AssociatedData(val value: ByteArray) {
-
-    init {
-        require(value.size <= MAX_SIZE)
-    }
+value class AssociatedData(val data: Data) {
 
     companion object {
 
-        const val MAX_SIZE = Size.MAX_MESSAGE
-
-        fun empty() = AssociatedData(ByteArray(0))
+        val empty get() = AssociatedData(Data.empty)
     }
-}
+}

src/main/kotlin/ChainingKey.kt

@@ -1,7 +1,4 @@
 package nl.sanderdijkhuis.noise
 
 @JvmInline
-value class ChainingKey(val digest: Digest) {
-
-    fun messageAuthenticationKey() = MessageAuthenticationKey(digest.value)
-}
+value class ChainingKey(val digest: Digest)

src/main/kotlin/CipherFunction.kt

@@ -1,25 +1,16 @@
 package nl.sanderdijkhuis.noise
 
+import nl.sanderdijkhuis.noise.Size.Companion.valueSize
+
 @JvmInline
 value class CipherKey(val value: ByteArray) {
 
     init {
-        require(value.size == SIZE)
+        require(value.valueSize == SIZE)
     }
 
-//    fun encrypt(
-//        nonce: Nonce, associatedData: AssociatedData,
-//        plaintext: Plaintext
-//    ) = CipherFunction.Encrypt(this, nonce, associatedData, plaintext)
-//
-//    fun decrypt(
-//        nonce: Nonce, associatedData: AssociatedData, ciphertext: Ciphertext
-//    ) = CipherFunction.Decrypt(this, nonce, associatedData, ciphertext)
-//
-//    fun rekey() = CipherFunction.Rekey(this)
-
     companion object {
 
-        const val SIZE = 32
+        val SIZE = Size(32)
     }
 }

src/main/kotlin/CipherKey.kt

@@ -1,28 +1,23 @@
 package nl.sanderdijkhuis.noise
 
-data class CipherState(val cryptography: Cryptography, val k: CipherKey? = null, val n: Nonce = Nonce.zero()) {
+data class CipherState(val cryptography: Cryptography, val key: CipherKey? = null, val nonce: Nonce = Nonce.zero) {
 
     fun encryptWithAssociatedData(associatedData: AssociatedData, plaintext: Plaintext) =
-        k?.let {
-            println("Encrypting $k $n $associatedData $plaintext")
-            State(copy(n = n.increment()), cryptography.encrypt(it, n, associatedData, plaintext))
+        key?.let {
+            println("Encrypting $key $nonce $associatedData $plaintext")
+            State(copy(nonce = nonce.increment()), cryptography.encrypt(it, nonce, associatedData, plaintext))
         } ?: let {
-            println("Returning plaintext $plaintext $n")
+            println("Returning plaintext $plaintext $nonce")
             State(this, plaintext.ciphertext)
         }
 
-    fun decryptWithAssociatedData(
-        associatedData: AssociatedData,
-        ciphertext: Ciphertext
-    ): State<CipherState, Plaintext>? = let {
-        println("Decrypting $k $n $associatedData $ciphertext")
-        if (k == null)
+    fun decryptWithAssociatedData(data: AssociatedData, ciphertext: Ciphertext): State<CipherState, Plaintext>? = let {
+        println("Decrypting $key $nonce $data $ciphertext")
+        if (key == null)
             State(this, ciphertext.plaintext)
         else
-            cryptography.decrypt(k, n, associatedData, ciphertext)?.let {
-                State(copy(n = n.increment()), it)
+            cryptography.decrypt(key, nonce, data, ciphertext)?.let {
+                State(copy(nonce = nonce.increment()), it)
             }
     }
-
-//    fun rekey() = k?.rekey()
 }

src/main/kotlin/CipherState.kt

@@ -3,7 +3,7 @@ package nl.sanderdijkhuis.noise
 @JvmInline
 value class Ciphertext(val value: ByteArray) {
 
-    fun data() = Data(value)
+    val data get() = Data(value)
 
     val plaintext get() = Plaintext(value)
 }

src/main/kotlin/Ciphertext.kt

@@ -1,19 +1,26 @@
 package nl.sanderdijkhuis.noise
 
+import nl.sanderdijkhuis.noise.Size.Companion.valueSize
 import kotlin.experimental.xor
 
 @JvmInline
 value class Data(val value: ByteArray) {
 
+    init {
+        require(value.valueSize <= Size.MAX_MESSAGE)
+    }
+
     operator fun plus(that: Data) = Data(this.value + that.value)
 
+    val size get() = value.valueSize
+
     fun xor(that: Data) = Data(let {
         require(value.size == that.value.size)
         ByteArray(value.size) { this.value[it].xor(that.value[it]) }
     })
 
     companion object {
 
-        fun empty() = Data(ByteArray(0))
+        val empty get() = Data(ByteArray(0))
     }
 }

src/main/kotlin/Data.kt

@@ -1,13 +1,13 @@
 package nl.sanderdijkhuis.noise
 
 @JvmInline
-value class Digest(val value: ByteArray) {
+value class Digest(val data: Data) {
 
     init {
-        require(value.size == HashConfiguration.hashSize.value)
+        require(data.size == HashFunction.HASH_SIZE)
     }
 
-    fun data() = Data(value)
+    val associatedData get() = AssociatedData(data)
 
-    fun associatedData() = AssociatedData(value)
+    val messageAuthenticationKey get() = MessageAuthenticationKey(data)
 }

src/main/kotlin/Digest.kt

@@ -1,7 +1,5 @@
 package nl.sanderdijkhuis.noise
 
-import nl.sanderdijkhuis.noise.HandshakeState.Token
-
 data class HandshakePattern(val name: ProtocolName, val preSharedMessagePatterns: List<List<Token>>, val messagePatterns: List<List<Token>>) {
 
     companion object {