nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Also sign header data

Browse source
This commit is contained in:
Felix Ableitner 2016-08-20 15:48:07 +02:00
parent 64fae3df99
commit 7c9c6803dc
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/main/scala/com/nutomic/ensichat/core/Crypto.scala
View file

@ -8,7 +8,7 @@ import javax.crypto.{Cipher, CipherOutputStream, KeyGenerator, SecretKey}
import com.nutomic.ensichat.core.Crypto._ import com.nutomic.ensichat.core.Crypto._
import com.nutomic.ensichat.core.body._ import com.nutomic.ensichat.core.body._
import com.nutomic.ensichat.core.header.ContentHeader import com.nutomic.ensichat.core.header.{MessageHeader, ContentHeader}
import com.nutomic.ensichat.core.interfaces.SettingsInterface import com.nutomic.ensichat.core.interfaces.SettingsInterface
import com.typesafe.scalalogging.Logger import com.typesafe.scalalogging.Logger
@ -136,11 +136,22 @@ class Crypto(settings: SettingsInterface, keyFolder: File) {
saveKey(address.toString, key) saveKey(address.toString, key)
} }
/**
* Prepares message header and body so that they can be signed/verified.
*/
private def messageForSigning(msg: Message): Array[Byte] = {
val header = msg.header match {
case ch: ContentHeader => ch.copy(tokens = 0, hopCount = 0)
case mh: MessageHeader => mh.copy(tokens = 0, hopCount = 0)
}
header.write(msg.body.length) ++ msg.body.write
}
def sign(msg: Message): Message = { def sign(msg: Message): Message = {
val sig = Signature.getInstance(SigningAlgorithm) val sig = Signature.getInstance(SigningAlgorithm)
val key = loadKey(PrivateKeyAlias, classOf[PrivateKey]) val key = loadKey(PrivateKeyAlias, classOf[PrivateKey])
sig.initSign(key) sig.initSign(key)
sig.update(msg.body.write) sig.update(messageForSigning(msg))
new Message(msg.header, new CryptoData(Option(sig.sign), msg.crypto.key), msg.body) new Message(msg.header, new CryptoData(Option(sig.sign), msg.crypto.key), msg.body)
} }
@ -149,7 +160,7 @@ class Crypto(settings: SettingsInterface, keyFolder: File) {
val sig = Signature.getInstance(SigningAlgorithm) val sig = Signature.getInstance(SigningAlgorithm)
lazy val defaultKey = loadKey(msg.header.origin.toString, classOf[PublicKey]) lazy val defaultKey = loadKey(msg.header.origin.toString, classOf[PublicKey])
sig.initVerify(key.getOrElse(defaultKey)) sig.initVerify(key.getOrElse(defaultKey))
sig.update(msg.body.write) sig.update(messageForSigning(msg))
sig.verify(msg.crypto.signature.get) sig.verify(msg.crypto.signature.get)
} }