Generating IV for every slot.

diff --git a/version2/src/C/CloudComm.cpp b/version2/src/C/CloudComm.cpp
index 9af2bf69bf89189bdf2dbc7c2d14af5898c0f42f..a729ac279bbc133ee36020531493c80742c20df9 100755 (executable)
--- a/version2/src/C/CloudComm.cpp
+++ b/version2/src/C/CloudComm.cpp
@@ -27,7 +27,6 @@ CloudComm::CloudComm() :
        password(NULL),
        random(NULL),
        salt(NULL),
-       ivArray(NULL),
        table(NULL),
        listeningPort(-1),
        doEnd(false),
@@ -47,7 +46,6 @@ CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password,
        password(_password->acquireRef()),
        random(new SecureRandom()),
        salt(NULL),
-       ivArray(NULL),
        table(_table),
        listeningPort(_listeningPort),
        doEnd(false),
@@ -64,8 +62,6 @@ CloudComm::~CloudComm() {
        delete putslot;
        if (salt)
                delete salt;
-       if (ivArray)
-               delete ivArray;
        if (password)
                password->releaseRef();
        if (random)
@@ -451,11 +447,10 @@ Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber)
        return buffer->array();
 }
 
-void CloudComm::createIV() {
-       if (ivArray == NULL) {
-               ivArray = new Array<char>(CloudComm_IV_SIZE);
-               random->nextBytes(ivArray);
-       }
+Array<char> *CloudComm::createIV() {
+       Array<char> *ivArray = new Array<char>(CloudComm_IV_SIZE);
+       random->nextBytes(ivArray);
+       return ivArray;
 }
 
 Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
@@ -516,11 +511,10 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
 
                int64_t sequencenumber = slot->getSequenceNumber();
                Array<char> *slotBytes = slot->encode(mac);
-               //Array<char> * ivBytes = slot->getSlotCryptIV();
-               //Array<char> *chars = encryptSlotAndPrependIV(slotBytes, ivBytes);
-               //delete ivBytes;
-               createIV();
-               Array<char> *chars = encryptSlotAndPrependIV(slotBytes, ivArray);
+               //Array<char> *ivBytes = slot->getSlotCryptIV();
+               Array<char> *ivBytes = createIV();
+               Array<char> *chars = encryptSlotAndPrependIV(slotBytes, ivBytes);
+               delete ivBytes;
                delete slotBytes;
                IoTString *url = buildRequest(true, sequencenumber, max);
                timer->startTime();
@@ -667,9 +661,9 @@ Array<char> *CloudComm::sendLocalData(Array<char> *sendData, int64_t localSequen
 
                // Encrypt the data for sending
                //Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
-               //Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
-               createIV();
-               Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, ivArray);
+               Array<char> *iv = createIV();
+               Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
+               delete iv;
 
                // Open a TCP socket connection to a local device
                TCPClient socket = createSocket(host, port);

diff --git a/version2/src/C/CloudComm.h b/version2/src/C/CloudComm.h
index 218fb4e25e20319109da2f04acc280e83a3d4444..1d81c2b060ef8ff06302cf3677d6fc36a81b9aed 100755 (executable)
--- a/version2/src/C/CloudComm.h
+++ b/version2/src/C/CloudComm.h
@@ -34,7 +34,6 @@ private:
        IoTString *password;
        SecureRandom *random;
        Array<char> *salt;
-       Array<char> *ivArray;
        Table *table;
        int32_t listeningPort;
        //      pthread_t localServerThread;
@@ -60,7 +59,7 @@ private:
        void setSalt();
        bool getSalt();
        Array<char> *createIV(int64_t machineId, int64_t localSequenceNumber);
-       void createIV();
+       Array<char> *createIV();
        Array<char> *encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes);
        Array<char> *stripIVAndDecryptSlot(Array<char> *rawData);
        Array<Slot *> *processSlots(WebConnection *wc);