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

Reduce CryptoData size by using smaller length fields.

Browse source
This commit is contained in:
Felix Ableitner 2014-12-17 02:36:39 +02:00
parent db33264b2d
commit 5934cb31ce
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PROTOCOL.md
View file

@ -106,16 +106,14 @@ message.
0 1 2 3 0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Signature Length | | Signature Length | Key Length |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
/ / / /
\ Signature (variable length) \ \ Signature (variable length) \
/ / / /
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Encryption Key Length |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
/ / / /
\ Encryption Key (variable length) \ \ Key (variable length) \
/ / / /
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

12
app/src/main/scala/com/nutomic/ensichat/protocol/messages/CryptoData.scala
View file

@ -3,6 +3,7 @@ package com.nutomic.ensichat.protocol.messages
import java.nio.ByteBuffer import java.nio.ByteBuffer
import java.util.Arrays import java.util.Arrays
import android.util.Log
import com.nutomic.ensichat.protocol.BufferUtils import com.nutomic.ensichat.protocol.BufferUtils
object CryptoData { object CryptoData {
@ -12,11 +13,11 @@ object CryptoData {
*/ */
def read(array: Array[Byte]): (CryptoData, Array[Byte]) = { def read(array: Array[Byte]): (CryptoData, Array[Byte]) = {
val b = ByteBuffer.wrap(array) val b = ByteBuffer.wrap(array)
val signatureLength = BufferUtils.getUnsignedInt(b).toInt val signatureLength = BufferUtils.getUnsignedShort(b)
val keyLength = BufferUtils.getUnsignedShort(b)
val signature = new Array[Byte](signatureLength) val signature = new Array[Byte](signatureLength)
b.get(signature, 0, signatureLength) b.get(signature, 0, signatureLength)
val keyLength = BufferUtils.getUnsignedInt(b).toInt
val key = val key =
if (keyLength != 0) { if (keyLength != 0) {
val key = new Array[Byte](keyLength) val key = new Array[Byte](keyLength)
@ -46,18 +47,17 @@ case class CryptoData(Signature: Option[Array[Byte]], Key: Option[Array[Byte]])
/** /**
* Writes this object into a new byte array. * Writes this object into a new byte array.
* @return
*/ */
def write: Array[Byte] = { def write: Array[Byte] = {
val b = ByteBuffer.allocate(length) val b = ByteBuffer.allocate(length)
BufferUtils.putUnsignedInt(b, Signature.get.length) BufferUtils.putUnsignedShort(b, Signature.get.length)
BufferUtils.putUnsignedShort(b, keyLength)
b.put(Signature.get) b.put(Signature.get)
BufferUtils.putUnsignedInt(b, keyLength)
if (Key.nonEmpty) b.put(Key.get) if (Key.nonEmpty) b.put(Key.get)
b.array() b.array()
} }
def length = 8 + Signature.get.length + keyLength def length = 4 + Signature.get.length + keyLength
private def keyLength = if (Key.isDefined) Key.get.length else 0 private def keyLength = if (Key.isDefined) Key.get.length else 0