Refactor

Author: sh123

include/hal/radio_task.h

@@ -80,7 +80,6 @@ class RadioTask {
   std::shared_ptr<MODULE_NAME> radioModule_;
   std::shared_ptr<AudioTask> audioTask_;
 
-  uint8_t iv_[CfgIvSize];
   std::shared_ptr<ChaChaPoly> cipher_;
 
   static TaskHandle_t loraTaskHandle_;

src/hal/radio_task.cpp

@@ -176,7 +176,7 @@ void RadioTask::rigTask()
   rigTaskStartReceive();
 
   byte *packetBuf = new byte[CfgRadioPacketBufLen];
-  byte *tmpBuf = new byte[CfgRadioPacketBufLen + sizeof(iv_) + sizeof(config_->AudioPrivacyData_)];
+  byte *tmpBuf = new byte[CfgRadioPacketBufLen + CfgIvSize + sizeof(config_->AudioPrivacyData_)];
 
   while (isRunning_) {
     uint32_t cmdBits = 0;
@@ -310,17 +310,15 @@ void RadioTask::encryptPacket(byte *inBuf, byte *outBuf, int inBufSize, int& out
   // add local auth data into the cipher
   cipher_->addAuthData(config_->AudioPrivacyData_, CfgAuthDataSize);
   // generate iv and include it into payload head
-  generateIv(outBuf);
-  cipher_->setIV(iv_, CfgIvSize);
+  for (int i = 0; i < CfgIvSize; i++) {
+    outBuf[i] = random(255);
+  }
+  cipher_->setIV(outBuf, CfgIvSize);
   // encrypt
   cipher_->encrypt(outBuf + CfgIvSize, inBuf, inBufSize);
   curOutBufSize += CfgIvSize;
   // generate auth tag and include it into payload tail
-  byte authTag[CfgAuthDataSize];
-  cipher_->computeTag(authTag, CfgAuthDataSize);
-  for (int i = 0; i < CfgAuthDataSize; i++) {
-    outBuf[curOutBufSize + i] = authTag[i];
-  }
+  cipher_->computeTag(outBuf + curOutBufSize, CfgAuthDataSize);
   curOutBufSize += CfgAuthDataSize;
   outBufSize = curOutBufSize;
 }
@@ -339,12 +337,4 @@ bool RadioTask::decryptPacket(byte *inBuf, byte *outBuf, int inBufSize, int& out
   return cipher_->checkTag(inBuf + CfgIvSize + curOutBufSize, CfgAuthDataSize);
 }
 
-void RadioTask::generateIv(byte *tmpBuf) 
-{
-  for (int i = 0; i < sizeof(iv_); i++) {
-    iv_[i] = random(255);
-    tmpBuf[i] = iv_[i];
-  }
-}
-
 } // LoraDv