pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-24 01:16:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Swapped out crypto engine for one that also works with AES-256

Browse Source
This commit is contained in:
Thomas Göttgens 2023-11-23 10:10:16 +01:00
parent 1feb74f525
commit ac318a9850
5 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/rp2040/rp2040.ini
View File

@ -21,4 +21,4 @@ lib_deps =
${arduino_base.lib_deps} ${arduino_base.lib_deps}
${environmental_base.lib_deps} ${environmental_base.lib_deps}
jgromes/RadioLib@^6.1.0 jgromes/RadioLib@^6.1.0
https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b rweather/Crypto

46
src/platform/rp2040/rp2040CryptoEngine.cpp
View File

@ -1,33 +1,63 @@
#include "AES.h"
#include "CTR.h"
#include "CryptoEngine.h" #include "CryptoEngine.h"
#include "aes.hpp"
#include "configuration.h" #include "configuration.h"
class RP2040CryptoEngine : public CryptoEngine class RP2040CryptoEngine : public CryptoEngine
{ {
CTRCommon *ctr = NULL;
public: public:
RP2040CryptoEngine() {} RP2040CryptoEngine() {}
~RP2040CryptoEngine() {} ~RP2040CryptoEngine() {}
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 * Encrypt a packet
* *
* @param bytes is updated in place * @param bytes is updated in place
*/ */
virtual void encrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes) override virtual void encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
{ {
if (key.length > 0) { if (key.length > 0) {
AES_ctx ctx; initNonce(fromNode, packetId);
initNonce(fromNode, packetNum); if (numBytes <= MAX_BLOCKSIZE) {
AES_init_ctx_iv(&ctx, key.bytes, nonce); static uint8_t scratch[MAX_BLOCKSIZE];
AES_CTR_xcrypt_buffer(&ctx, bytes, numBytes); 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 packetNum, size_t numBytes, uint8_t *bytes) override virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
{ {
// For CTR, the implementation is the same // For CTR, the implementation is the same
encrypt(fromNode, packetNum, numBytes, bytes); encrypt(fromNode, packetId, numBytes, bytes);
} }
private: private:

7
variants/rak11310/variant.h
View File

@ -4,13 +4,6 @@
#define ARDUINO_ARCH_AVR #define ARDUINO_ARCH_AVR
#undef CBC
#define CBC 0
#undef CTR
#define CTR 1
#undef ECB
#define ECB 0
#define LED_CONN PIN_LED2 #define LED_CONN PIN_LED2
#define LED_PIN LED_BUILTIN #define LED_PIN LED_BUILTIN

7
variants/rpipico/variant.h
View File

@ -4,13 +4,6 @@
#define ARDUINO_ARCH_AVR #define ARDUINO_ARCH_AVR
#undef CBC
#define CBC 0
#undef CTR
#define CTR 1
#undef ECB
#define ECB 0
#define USE_SH1106 1 #define USE_SH1106 1
// default I2C pins: // default I2C pins:

7
variants/rpipicow/variant.h
View File

@ -4,13 +4,6 @@
#define ARDUINO_ARCH_AVR #define ARDUINO_ARCH_AVR
#undef CBC
#define CBC 0
#undef CTR
#define CTR 1
#undef ECB
#define ECB 0
#define USE_SH1106 1 #define USE_SH1106 1
// default I2C pins: // default I2C pins: