projects
/
iotcloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae6d8d3
)
edits
author
bdemsky
<bdemsky@uci.edu>
Fri, 2 Mar 2018 18:29:06 +0000
(10:29 -0800)
committer
bdemsky
<bdemsky@uci.edu>
Fri, 2 Mar 2018 18:29:06 +0000
(10:29 -0800)
version2/src/C/CloudComm.cc
patch
|
blob
|
history
diff --git
a/version2/src/C/CloudComm.cc
b/version2/src/C/CloudComm.cc
index d1ba7cacb099dd2cb5eac26969c692302b383366..3b5fb970199962959a18895dc03824a3b923ebf4 100644
(file)
--- a/
version2/src/C/CloudComm.cc
+++ b/
version2/src/C/CloudComm.cc
@@
-9,6
+9,7
@@
#include "Slot.h"
#include "Crypto.h"
#include "ByteBuffer.h"
#include "Slot.h"
#include "Crypto.h"
#include "ByteBuffer.h"
+#include "aes.h"
#include <sys/socket.h>
#include <unistd.h>
#include <sys/socket.h>
#include <unistd.h>
@@
-246,11
+247,15
@@
Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber)
}
Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
}
Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
- return NULL;
+ Array<char> * output=new Array<char>(data->length());
+ aes_encrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *) output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+ return output;
}
Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
}
Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
- return NULL;
+ Array<char> * output=new Array<char>(data->length());
+ aes_decrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *)output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+ return output;
}
Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
}
Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {