make apollo decent again

src/FSCommon.cpp

@@ -24,6 +24,35 @@ SPIClass SPI1(HSPI);
 
 #endif // HAS_SDCARD
 
+#if defined(ARCH_APOLLO3)
+// Apollo series 2 Kbytes (8 rows of 256 bytes)
+
+uint16_t OSFS::startOfEEPROM = 1;
+uint16_t OSFS::endOfEEPROM = 2048;
+
+// Useful consts
+const OSFS::result noerr = OSFS::result::NO_ERROR;
+const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
+
+// 3) How do I read from the medium?
+void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output)
+{
+    for (uint16_t i = address; i < address + num; i++) {
+        *output = EEPROM.read(i);
+        output++;
+    }
+}
+
+// 4) How to I write to the medium?
+void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input)
+{
+    for (uint16_t i = address; i < address + num; i++) {
+        EEPROM.update(i, *input);
+        input++;
+    }
+}
+#endif
+
 /**
  * @brief Copies a file from one location to another.
  *

src/FSCommon.h

@@ -25,30 +25,18 @@ using namespace LittleFS_Namespace;
 #include <EEPROM.h>
 #include <OSFS.h>
 
-uint16_t OSFS::startOfEEPROM = 1;
-uint16_t OSFS::endOfEEPROM = 2048;
+extern uint16_t OSFS::startOfEEPROM;
+extern uint16_t OSFS::endOfEEPROM;
 
 // Useful consts
-const OSFS::result noerr = OSFS::result::NO_ERROR;
-const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
+extern const OSFS::result noerr;
+extern const OSFS::result notfound;
 
 // 3) How do I read from the medium?
-void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output)
-{
-    for (uint16_t i = address; i < address + num; i++) {
-        *output = EEPROM.read(i);
-        output++;
-    }
-}
+void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output);
 
 // 4) How to I write to the medium?
-void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input)
-{
-    for (uint16_t i = address; i < address + num; i++) {
-        EEPROM.update(i, *input);
-        input++;
-    }
-}
+void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input);
 #endif
 
 #if defined(ARCH_RP2040)

src/mesh/NodeDB.h

@@ -213,4 +213,6 @@ extern uint32_t error_address;
 #define Module_Config_size                                                                                                       \
     (ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size +       \
      ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size +                 \
-     ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
+     ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
+
+// Please do not remove this comment, it makes trunk and compiler happy at the same time.

src/platform/apollo3/Apollo3CryptoEngine.cpp

@@ -0,0 +1,66 @@
+#include "AES.h"
+#include "CTR.h"
+#include "CryptoEngine.h"
+#include "configuration.h"
+
+class Apollo3CryptoEngine : public CryptoEngine
+{
+
+    CTRCommon *ctr = NULL;
+
+  public:
+    Apollo3CryptoEngine() {}
+
+    ~Apollo3CryptoEngine() {}
+
+    virtual void setKey(const CryptoKey &k) override
+    {
+        CryptoEngine::setKey(k);
+        LOG_DEBUG("Installing AES%d key!\n", key.length * 8);
+        if (ctr) {
+            delete ctr;
+            ctr = NULL;
+        }
+        if (key.length != 0) {
+            if (key.length == 16)
+                ctr = new CTR<AES128>();
+            else
+                ctr = new CTR<AES256>();
+
+            ctr->setKey(key.bytes, key.length);
+        }
+    }
+    /**
+     * Encrypt a packet
+     *
+     * @param bytes is updated in place
+     */
+    virtual void encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
+    {
+        if (key.length > 0) {
+            initNonce(fromNode, packetId);
+            if (numBytes <= MAX_BLOCKSIZE) {
+                static uint8_t scratch[MAX_BLOCKSIZE];
+                memcpy(scratch, bytes, numBytes);
+                memset(scratch + numBytes, 0,
+                       sizeof(scratch) - numBytes); // Fill rest of buffer with zero (in case cypher looks at it)
+
+                ctr->setIV(nonce, sizeof(nonce));
+                ctr->setCounterSize(4);
+                ctr->encrypt(bytes, scratch, numBytes);
+            } else {
+                LOG_ERROR("Packet too large for crypto engine: %d. noop encryption!\n", numBytes);
+            }
+        }
+    }
+
+    virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
+    {
+        // For CTR, the implementation is the same
+        encrypt(fromNode, packetId, numBytes, bytes);
+    }
+
+  private:
+};
+
+CryptoEngine *crypto = new Apollo3CryptoEngine();

src/platform/apollo3/main-apollo3.cpp

@@ -13,7 +13,9 @@ void getMacAddr(uint8_t *dmac)
         dmac[i] = i;
 }
 
-void cpuDeepSleep(uint64_t msecToWake) {}
+void cpuDeepSleep(uint32_t msecToWake) {}
+
+void initVariant() {}
 
 /* pacify libc_nano */
 extern "C" {