IV changes

diff --git a/version2/src/java/iotcloud/CloudComm.java b/version2/src/java/iotcloud/CloudComm.java
index d0a514d30cd5a3f12ce3c13efcf69b6e4873ebe1..1b10efe621dd526d8985699c5ab2bfac99911fbf 100644 (file)
--- a/version2/src/java/iotcloud/CloudComm.java
+++ b/version2/src/java/iotcloud/CloudComm.java
@@ -247,7 +247,8 @@ class CloudComm {
        private byte[] createIV(long machineId, long localSequenceNumber) {
                ByteBuffer buffer = ByteBuffer.allocate(IV_SIZE);
                buffer.putLong(machineId);
-               buffer.putLong(localSequenceNumber);
+               long localSequenceNumberShifted = localSequenceNumber << 16;
+               buffer.putLong(localSequenceNumberShifted);
                return buffer.array();
 
        }

diff --git a/version2/src/java/iotcloud/Slot.java b/version2/src/java/iotcloud/Slot.java
index b881efe5e05da3ac8f2f8f0cd5817e7598320c10..153ef800c56881b380f131dda03c27a5dc1c934a 100644 (file)
--- a/version2/src/java/iotcloud/Slot.java
+++ b/version2/src/java/iotcloud/Slot.java
@@ -222,11 +222,11 @@ class Slot implements Liveness {
        public byte[] getSlotCryptIV() {
                ByteBuffer buffer = ByteBuffer.allocate(CloudComm.IV_SIZE);
                buffer.putLong(machineid);
-               buffer.putLong(localSequenceNumber);
+               long localSequenceNumberShift = localSequenceNumber << 16;
+               buffer.putLong(localSequenceNumberShift);
                return buffer.array();
        }
 
-
        public String toString() {
                return "<" + getSequenceNumber() + ">";
        }