Cansat
/
RFM69_LowPowerLab
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix encrypt() for null or "" keys

This commit is contained in:
Felix Rusu 2020-06-05 13:50:31 -04:00
parent c6445acc30
commit fe6ccf1624
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RFM69.cpp
View File

@ -438,7 +438,8 @@ void RFM69::encrypt(const char* key) {
_haveEncryptKey = key; _haveEncryptKey = key;
#endif #endif
setMode(RF69_MODE_STANDBY); setMode(RF69_MODE_STANDBY);
if (key != 0) uint8_t validKey = key != 0 && strlen(key)!=0;
if (validKey)
{ {
#if defined(RF69_LISTENMODE_ENABLE) #if defined(RF69_LISTENMODE_ENABLE)
memcpy(_encryptKey, key, 16); memcpy(_encryptKey, key, 16);
@ -449,7 +450,7 @@ void RFM69::encrypt(const char* key) {
_spi->transfer(key[i]); _spi->transfer(key[i]);
unselect(); unselect();
} }
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFE) | (key ? 1 : 0)); writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFE) | (validKey ? 1 : 0));
} }
// get the received signal strength indicator (RSSI) // get the received signal strength indicator (RSSI)