mirror of
https://github.com/thelsing/knx.git
synced 2024-10-20 20:07:45 +02:00
save work
This commit is contained in:
Nanosonde
parent
30467aea05
commit
9c45500e0e
@ -21,6 +21,9 @@ BauSystemB::BauSystemB(Platform& platform): _memory(platform, _deviceObj), _addr
|
||||
#endif
|
||||
_transLayer(_appLayer, _addrTable), _netLayer(_transLayer)
|
||||
{
|
||||
#ifdef USE_DATASECURE
|
||||
_secIfObj.secureApplicationLayer(_appLayer);
|
||||
#endif
|
||||
_appLayer.transportLayer(_transLayer);
|
||||
_transLayer.networkLayer(_netLayer);
|
||||
_memory.addSaveRestore(&_deviceObj);
|
||||
|
||||
@ -45,7 +45,7 @@ void SecureApplicationLayer::dataGroupIndication(HopCountType hopType, Priority
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataGroupIndication(hopType, priority, tsap, plainFrame.apdu());
|
||||
@ -65,7 +65,7 @@ void SecureApplicationLayer::dataGroupConfirm(AckType ack, HopCountType hopType,
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataGroupConfirm(ack, hopType, priority, tsap, plainFrame.apdu(), status);
|
||||
@ -85,7 +85,7 @@ void SecureApplicationLayer::dataBroadcastIndication(HopCountType hopType, Prior
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataBroadcastIndication(hopType, priority, source, plainFrame.apdu());
|
||||
@ -105,7 +105,7 @@ void SecureApplicationLayer::dataBroadcastConfirm(AckType ack, HopCountType hopT
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataBroadcastConfirm(ack, hopType, priority, plainFrame.apdu(), status);
|
||||
@ -125,7 +125,7 @@ void SecureApplicationLayer::dataSystemBroadcastIndication(HopCountType hopType,
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataSystemBroadcastIndication(hopType, priority, source, plainFrame.apdu());
|
||||
@ -145,7 +145,7 @@ void SecureApplicationLayer::dataSystemBroadcastConfirm(HopCountType hopType, Pr
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataSystemBroadcastConfirm(hopType, priority, plainFrame.apdu(), status);
|
||||
@ -156,7 +156,7 @@ void SecureApplicationLayer::dataSystemBroadcastConfirm(HopCountType hopType, Pr
|
||||
ApplicationLayer::dataSystemBroadcastConfirm(hopType, priority, apdu, status);
|
||||
}
|
||||
|
||||
void SecureApplicationLayer::dataIndividualIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu)
|
||||
void SecureApplicationLayer::dataIndividualIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu)
|
||||
{
|
||||
if (apdu.type() == SecureService)
|
||||
{
|
||||
@ -165,29 +165,29 @@ void SecureApplicationLayer::dataIndividualIndication(HopCountType hopType, Prio
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataIndividualIndication(hopType, priority, tsap, plainFrame.apdu());
|
||||
ApplicationLayer::dataIndividualIndication(hopType, priority, source, plainFrame.apdu());
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
ApplicationLayer::dataIndividualIndication(hopType, priority, tsap, apdu);
|
||||
ApplicationLayer::dataIndividualIndication(hopType, priority, source, apdu);
|
||||
}
|
||||
|
||||
void SecureApplicationLayer::dataIndividualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, bool status)
|
||||
void SecureApplicationLayer::dataIndividualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t source, APDU& apdu, bool status)
|
||||
{
|
||||
if (apdu.type() == SecureService)
|
||||
{
|
||||
// Decrypt secure APDU
|
||||
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataIndividualConfirm(ack, hopType, priority, tsap, apdu, status);
|
||||
ApplicationLayer::dataIndividualConfirm(ack, hopType, priority, source, apdu, status);
|
||||
}
|
||||
else
|
||||
{
|
||||
ApplicationLayer::dataIndividualConfirm(ack, hopType, priority, tsap, apdu, status);
|
||||
ApplicationLayer::dataIndividualConfirm(ack, hopType, priority, source, apdu, status);
|
||||
}
|
||||
}
|
||||
|
||||
@ -199,7 +199,7 @@ void SecureApplicationLayer::dataConnectedIndication(Priority priority, uint16_t
|
||||
uint16_t plainApduLength = apdu.length() - 1 - 6 - 4; // secureAdsuLength - sizeof(scf) - sizeof(seqNum) - sizeof(mac)
|
||||
CemiFrame plainFrame(plainApduLength);
|
||||
// Decrypt secure APDU
|
||||
if (decryptSecureApdu(apdu, plainFrame.apdu()))
|
||||
if (decodeSecureApdu(apdu, plainFrame.apdu()))
|
||||
{
|
||||
// Process decrypted inner APDU
|
||||
ApplicationLayer::dataConnectedIndication(priority, tsap, plainFrame.apdu());
|
||||
@ -219,6 +219,23 @@ void SecureApplicationLayer::dataConnectedConfirm(uint16_t tsap)
|
||||
|
||||
void SecureApplicationLayer::dataGroupRequest(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu)
|
||||
{
|
||||
// TODO:
|
||||
// get flags for this TSAP from PID_GO_SECURITY_FLAGS from SecIntObj
|
||||
bool needsEncryption = true;
|
||||
|
||||
if (needsEncryption)
|
||||
{
|
||||
//ByteBuffer secureApdu = ByteBuffer.allocate(3 + SeqSize + apdu.length + MacSize);
|
||||
uint16_t secureApduLength = apdu.length() + 3 + 6 + 4; // 3(TPCI,APCI,SCF) + sizeof(seqNum) + apdu.length() + 4
|
||||
CemiFrame secureFrame(secureApduLength);
|
||||
// create secure APDU
|
||||
if (createSecureApdu(apdu, secureFrame.apdu(), true, true)) // TODO: toolAccess, confidentialty
|
||||
{
|
||||
ApplicationLayer::dataGroupRequest(ack, hopType, priority, tsap, secureFrame.apdu());
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
ApplicationLayer::dataGroupRequest(ack, hopType, priority, tsap, apdu);
|
||||
}
|
||||
|
||||
@ -353,6 +370,7 @@ uint64_t SecureApplicationLayer::toUInt64(uint8_t* data, uint8_t dataLen)
|
||||
|
||||
const uint8_t* SecureApplicationLayer::toolKey(uint16_t devAddr)
|
||||
{
|
||||
//TODO: multiple tool keys possible
|
||||
const uint8_t* toolKey = _secIfObj.propertyData(PID_TOOL_KEY);
|
||||
return toolKey;
|
||||
}
|
||||
@ -490,12 +508,21 @@ void SecureApplicationLayer::sendSyncResponse(uint16_t dstAddr, bool dstAddrIsGr
|
||||
|
||||
CemiFrame response(3 + 6 + sizeof(asdu) + 4); // 3 bytes (TPCI, APCI, SCF) + 6 bytes (SeqNum) + 12 bytes + 4 bytes (MAC)
|
||||
|
||||
if(secure(response.data() + APDU_LPDU_DIFF, SecureSyncResponse, _deviceObj.induvidualAddress(), dstAddr, dstAddrIsGroupAddr, asdu, sizeof(asdu), toolAccess, true))
|
||||
uint8_t tpci = _transportLayer->getTPCI(dstAddr); // get next TPCI sequence number for MAC calculation from TL
|
||||
print("sendSyncResponse: TPCI: ");
|
||||
println(tpci, HEX);
|
||||
|
||||
if(secure(response.data() + APDU_LPDU_DIFF, SecureSyncResponse, _deviceObj.induvidualAddress(), dstAddr, dstAddrIsGroupAddr, tpci, asdu, sizeof(asdu), toolAccess, true))
|
||||
{
|
||||
_lastSyncRes = millis();
|
||||
|
||||
println("SyncResponse: ");
|
||||
response.apdu().printPDU();
|
||||
|
||||
// Send encrypted SyncResponse message using T_DATA_INDIVIDUAL
|
||||
_transportLayer->dataIndividualRequest(AckType::AckDontCare, NetworkLayerParameter, SystemPriority, dstAddr, response.apdu());
|
||||
|
||||
//TODO: either send on T_DATA_INDIVIDUAL or T_DATA_CONNECTED depending on reception
|
||||
}
|
||||
}
|
||||
|
||||
@ -746,18 +773,18 @@ bool SecureApplicationLayer::decrypt(uint8_t* plainApdu, uint16_t plainApduLengt
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SecureApplicationLayer::decryptSecureApdu(APDU& secureApdu, APDU& plainApdu)
|
||||
bool SecureApplicationLayer::decodeSecureApdu(APDU& secureApdu, APDU& plainApdu)
|
||||
{
|
||||
// Decrypt secure APDU
|
||||
// Decode secure APDU
|
||||
|
||||
println("Secure APDU: ");
|
||||
println("decodeSecureApdu: Secure APDU: ");
|
||||
secureApdu.printPDU();
|
||||
|
||||
uint16_t srcAddress = secureApdu.frame().sourceAddress();
|
||||
uint16_t dstAddress = secureApdu.frame().destinationAddress();
|
||||
bool isDstAddrGroupAddr = secureApdu.frame().addressType() == GroupAddress;
|
||||
uint8_t tpci = secureApdu.frame().data()[TPDU_LPDU_DIFF]; // FIXME: when cEMI class is refactored, there might be additional info fields in cEMI [fixed TPDU_LPDU_DIFF]
|
||||
print("Secure Debug: TPCI: ");
|
||||
print("decodeSecureApdu: TPCI: ");
|
||||
println(tpci, HEX);
|
||||
// Note:
|
||||
// The TPCI is also included in the MAC calculation to provide authenticity for this field.
|
||||
@ -771,7 +798,7 @@ bool SecureApplicationLayer::decryptSecureApdu(APDU& secureApdu, APDU& plainApdu
|
||||
// FIXME: when cEMI class is refactored, there might be additional info fields in cEMI (fixed APDU_LPDU_DIFF)
|
||||
if (decrypt(plainApdu.frame().data()+APDU_LPDU_DIFF, plainApdu.length(), srcAddress, dstAddress, isDstAddrGroupAddr, tpci, secureApdu.data()))
|
||||
{
|
||||
println("Plain APDU: ");
|
||||
println("decodeSecureApdu: Plain APDU: ");
|
||||
plainApdu.frame().apdu().printPDU();
|
||||
|
||||
return true;
|
||||
@ -780,7 +807,7 @@ bool SecureApplicationLayer::decryptSecureApdu(APDU& secureApdu, APDU& plainApdu
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SecureApplicationLayer::secure(uint8_t* buffer, uint16_t service, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr,
|
||||
bool SecureApplicationLayer::secure(uint8_t* buffer, uint16_t service, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t tpci,
|
||||
uint8_t* apdu, uint16_t apduLength, bool toolAccess, bool confidentiality)
|
||||
{
|
||||
if (toolAccess)
|
||||
@ -800,16 +827,15 @@ bool SecureApplicationLayer::secure(uint8_t* buffer, uint16_t service, uint16_t
|
||||
const uint8_t* key = toolAccess ? toolKey(_syncReqBroadcast ? _deviceObj.induvidualAddress() : dstAddr) : securityKey(dstAddr, dstAddrIsGroupAddr);
|
||||
if (key == nullptr)
|
||||
{
|
||||
print("Error: No key found. toolAccess: ");
|
||||
println(toolAccess ? "true" : "false");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool syncReq = service == SecureSyncRequest;
|
||||
bool syncRes = service == SecureSyncResponse;
|
||||
|
||||
uint8_t snoLength = syncReq ? 6 : 0;
|
||||
//ByteBuffer secureApdu = ByteBuffer.allocate(3 + SeqSize + snoLength + apdu.length + MacSize);
|
||||
|
||||
uint8_t tpci = _transportLayer->getTPCI(dstAddr) | (SecureService >> 8);
|
||||
tpci |= SecureService >> 8; // OR'ing upper two APCI bits
|
||||
uint8_t apci = SecureService & 0x00FF;
|
||||
uint8_t* pBuf = buffer;
|
||||
pBuf = pushByte(tpci, pBuf); // TPCI
|
||||
@ -923,39 +949,48 @@ bool SecureApplicationLayer::secure(uint8_t* buffer, uint16_t service, uint16_t
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
void SecureApplicationLayer::test_datasecure_encrypt()
|
||||
bool SecureApplicationLayer::createSecureApdu(APDU& plainApdu, APDU& secureApdu, bool toolAccess, bool confidentialty)
|
||||
{
|
||||
TpTelegram t;
|
||||
t.parseByteArray(plainTelegram);
|
||||
// Create secure APDU
|
||||
|
||||
if (!t.isSecureTelegram())
|
||||
println("createSecureApdu: Plain APDU: ");
|
||||
plainApdu.printPDU();
|
||||
|
||||
uint16_t srcAddress = plainApdu.frame().sourceAddress();
|
||||
uint16_t dstAddress = plainApdu.frame().destinationAddress();
|
||||
bool isDstAddrGroupAddr = plainApdu.frame().addressType() == GroupAddress;
|
||||
uint8_t tpci = _transportLayer->getTPCI(dstAddress); // get next TPCI sequence number for MAC calculation from TL
|
||||
print("createSecureApdu: TPCI: ");
|
||||
println(tpci, HEX);
|
||||
// Note:
|
||||
// The TPCI is also included in the MAC calculation to provide authenticity for this field.
|
||||
// However, a secure APDU (with a MAC) is only included in transport layer PDUs T_DATA_GROUP, T_DATA_TAG_GROUP, T_DATA_INDIVIDUAL, T_DATA_CONNECTED
|
||||
// and not in T_CONNECT, T_DISCONNECT, T_ACK, T_NACK.
|
||||
// This means the DATA/CONTROL flag is always 0(=DATA). The flag "NUMBERED" differentiates between T_DATA_INDIVIDUAL and T_DATA_CONNECTED.
|
||||
// The seqNumber is only used in T_DATA_CONNECTED and 0 in case of T_DATA_GROUP and T_DATA_GROUP (leaving out T_DATA_TAG_GROUP).
|
||||
// Summary: effectively only the "NUMBERED" flag (bit6) and the SeqNumber (bit5-2) are used from transport layer.
|
||||
// In T_DATA_* services the bits1-0 of TPCI octet are used as bits9-8 for APCI type which is fixed to 0x03. SecureService APCI is 0x03F1.
|
||||
|
||||
// FIXME: when cEMI class is refactored, there might be additional info fields in cEMI (fixed APDU_LPDU_DIFF)
|
||||
if(secure(secureApdu.frame().data()+APDU_LPDU_DIFF, SecureDataPdu, srcAddress, dstAddress, isDstAddrGroupAddr, tpci, plainApdu.data(), plainApdu.length(), toolAccess, confidentialty))
|
||||
{
|
||||
uint16_t bufLen = 4 + t.ApduLen();
|
||||
// AES-128 operates on blocks of 16 bytes, add padding
|
||||
//uint16_t bufLenPadded = (bufLen + 15) / 16 * 16;
|
||||
//uint8_t buffer[bufLenPadded];
|
||||
uint8_t buffer[bufLen];
|
||||
// Make sure to have zeroes everywhere, because of the padding
|
||||
//memset(buffer, 0x00, bufLenPadded);
|
||||
updateSequenceNumber(toolAccess, nextSequenceNumber(toolAccess) + 1);
|
||||
|
||||
encrypt(buffer, t.SrcAddr(), t.DstAddr(), t.Tpci(), t.Apdu(), t.ApduLen());
|
||||
println("createSecureApdu: Secure APDU: ");
|
||||
plainApdu.frame().apdu().printPDU();
|
||||
|
||||
std::cout << "Secure Data: ";
|
||||
for (uint8_t i = 0; i< t.ApduLen(); i++)
|
||||
{
|
||||
std::cout << std::hex << static_cast<unsigned int>(buffer[4+i]) << " ";
|
||||
}
|
||||
std::cout << std::endl;
|
||||
|
||||
uint32_t mac;
|
||||
popInt(mac, &buffer[0]);
|
||||
|
||||
std::cout << std::hex << "MAC: " << mac << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Telegram is secured!" << std::endl;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void SecureApplicationLayer::setSecurityMode(bool enabled)
|
||||
{
|
||||
_securityModeEnabled = enabled;
|
||||
}
|
||||
|
||||
bool SecureApplicationLayer::isSecurityModeEnabled()
|
||||
{
|
||||
return _securityModeEnabled;
|
||||
}
|
||||
*/
|
||||
|
||||
@ -26,6 +26,9 @@ class SecureApplicationLayer : public ApplicationLayer
|
||||
*/
|
||||
SecureApplicationLayer(DeviceObject& deviceObj, SecurityInterfaceObject& secIfObj, AssociationTableObject& assocTable, BusAccessUnit& bau);
|
||||
|
||||
void setSecurityMode(bool enabled);
|
||||
bool isSecurityModeEnabled();
|
||||
|
||||
// from transport layer
|
||||
virtual void dataGroupIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu) override;
|
||||
virtual void dataGroupConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap,
|
||||
@ -79,9 +82,12 @@ class SecureApplicationLayer : public ApplicationLayer
|
||||
void receivedSyncResponse(uint16_t remoteAddr, bool toolAccess, uint8_t* plainApdu);
|
||||
|
||||
bool decrypt(uint8_t* plainApdu, uint16_t plainapduLength, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t tpci, uint8_t* secureAsdu);
|
||||
bool secure(uint8_t* buffer, uint16_t service, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t* apdu, uint16_t apduLength, bool toolAccess, bool confidentiality);
|
||||
bool secure(uint8_t* buffer, uint16_t service, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t tpci, uint8_t* apdu, uint16_t apduLength, bool toolAccess, bool confidentiality);
|
||||
|
||||
bool decryptSecureApdu(APDU& secureApdu, APDU &plainApdu);
|
||||
bool decodeSecureApdu(APDU& secureApdu, APDU& plainApdu);
|
||||
bool createSecureApdu(APDU& plainApdu, APDU& secureApdu, bool toolAccess, bool confidentialty);
|
||||
|
||||
bool _securityModeEnabled {false};
|
||||
|
||||
bool _syncReqBroadcast;
|
||||
uint32_t _lastSyncRes;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include "security_interface_object.h"
|
||||
#include "secure_application_layer.h"
|
||||
#include "bits.h"
|
||||
#include "data_property.h"
|
||||
#include "callback_property.h"
|
||||
@ -10,6 +11,8 @@
|
||||
|
||||
// Our FDSK
|
||||
uint8_t SecurityInterfaceObject::_fdsk[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
|
||||
uint8_t SecurityInterfaceObject::_secReport[] = { 0x00, 0x00, 0x00 };
|
||||
uint8_t SecurityInterfaceObject::_secReportCtrl[] = { 0x00, 0x00, 0x00 };
|
||||
|
||||
SecurityInterfaceObject::SecurityInterfaceObject()
|
||||
{
|
||||
@ -48,8 +51,7 @@ SecurityInterfaceObject::SecurityInterfaceObject()
|
||||
resultData[0] = 0xF8; // DataVoid
|
||||
return;
|
||||
}
|
||||
// TODO
|
||||
//setSecurityMode(mode == 1);
|
||||
obj->_secAppLayer->setSecurityMode(mode == 1);
|
||||
resultData[0] = serviceId;
|
||||
}
|
||||
},
|
||||
@ -65,9 +67,8 @@ SecurityInterfaceObject::SecurityInterfaceObject()
|
||||
}
|
||||
if (length == 2)
|
||||
{
|
||||
// TODO
|
||||
resultData[0] = serviceId;
|
||||
//resultData[1] = isSecurityModeEnabled() ? 1 : 0;
|
||||
resultData[1] = obj->_secAppLayer->isSecurityModeEnabled() ? 1 : 0;
|
||||
resultLength = 2;
|
||||
}
|
||||
}),
|
||||
@ -128,9 +129,9 @@ SecurityInterfaceObject::SecurityInterfaceObject()
|
||||
}
|
||||
}),
|
||||
new DataProperty( PID_TOOL_KEY, true, PDT_GENERIC_16, 1, ReadLv3 | WriteLv0, (uint8_t*) _fdsk ), // default is FDSK
|
||||
new DataProperty( PID_SECURITY_REPORT, true, PDT_BITSET8, 1, ReadLv3 | WriteLv0, (uint16_t)0 ), // TODO: value
|
||||
new DataProperty( PID_SECURITY_REPORT_CONTROL, true, PDT_BINARY_INFORMATION, 1, ReadLv3 | WriteLv0, (uint16_t)0 ), // TODO: value
|
||||
new DataProperty( PID_SEQUENCE_NUMBER_SENDING, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv0, (uint16_t)0 ), // TODO: value
|
||||
new DataProperty( PID_SECURITY_REPORT, true, PDT_BITSET8, 1, ReadLv3 | WriteLv0, _secReport ), // Not implemented
|
||||
new DataProperty( PID_SECURITY_REPORT_CONTROL, true, PDT_BINARY_INFORMATION, 1, ReadLv3 | WriteLv0, _secReportCtrl ), // Not implemented
|
||||
new DataProperty( PID_SEQUENCE_NUMBER_SENDING, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv0 ), // Updated by our devices accordingly
|
||||
new DataProperty( PID_ZONE_KEY_TABLE, true, PDT_GENERIC_19, 1, ReadLv3 | WriteLv0 ), // written by ETS
|
||||
new DataProperty( PID_GO_SECURITY_FLAGS, true, PDT_GENERIC_01, 1, ReadLv3 | WriteLv0 ), // written by ETS
|
||||
new DataProperty( PID_ROLE_TABLE, true, PDT_GENERIC_01, 1, ReadLv3 | WriteLv0 ), // written by ETS
|
||||
@ -138,6 +139,11 @@ SecurityInterfaceObject::SecurityInterfaceObject()
|
||||
initializeProperties(sizeof(properties), properties);
|
||||
}
|
||||
|
||||
void SecurityInterfaceObject::secureApplicationLayer(SecureApplicationLayer& secAppLayer)
|
||||
{
|
||||
_secAppLayer = &secAppLayer;
|
||||
}
|
||||
|
||||
uint8_t* SecurityInterfaceObject::save(uint8_t* buffer)
|
||||
{
|
||||
//buffer = pushWord(_ownAddress, buffer);
|
||||
|
||||
@ -5,10 +5,15 @@
|
||||
|
||||
#include "interface_object.h"
|
||||
|
||||
class SecureApplicationLayer;
|
||||
|
||||
class SecurityInterfaceObject: public InterfaceObject
|
||||
{
|
||||
public:
|
||||
SecurityInterfaceObject();
|
||||
|
||||
void secureApplicationLayer(SecureApplicationLayer& secAppLayer);
|
||||
|
||||
uint8_t* save(uint8_t* buffer) override;
|
||||
const uint8_t* restore(const uint8_t* buffer) override;
|
||||
uint16_t saveSize() override;
|
||||
@ -16,9 +21,13 @@ public:
|
||||
bool isLoaded();
|
||||
|
||||
private:
|
||||
SecureApplicationLayer* _secAppLayer = nullptr;
|
||||
|
||||
LoadState _state = LS_UNLOADED;
|
||||
|
||||
// Our FDSK
|
||||
static uint8_t _fdsk[];
|
||||
static uint8_t _secReport[];
|
||||
static uint8_t _secReportCtrl[];
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -530,11 +530,11 @@ void TransportLayer::ackTimeoutIndication()
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t TransportLayer::getTPCI(uint16_t dstAddress)
|
||||
uint8_t TransportLayer::getTPCI(uint16_t dstAddr)
|
||||
{
|
||||
// Return seqNum that would be used for sending next frame
|
||||
// together with the TPDU type.
|
||||
return ((_seqNoSend & 0xF) << 2) | ((dstAddress == _connectionAddress) ? 0x40 : 0);
|
||||
return ((_seqNoSend & 0xF) << 2) | ((dstAddr == _connectionAddress) ? 0x40 : 0);
|
||||
}
|
||||
|
||||
void TransportLayer::loop()
|
||||
|
||||
@ -57,7 +57,7 @@ public:
|
||||
// apdu must be valid until it was confirmed
|
||||
void dataConnectedRequest(uint16_t tsap, Priority priority, APDU& apdu);
|
||||
|
||||
uint8_t getTPCI(uint16_t tsap);
|
||||
uint8_t getTPCI(uint16_t dstAddr);
|
||||
#pragma endregion
|
||||
|
||||
#pragma region other
|
||||
|
||||
Loading…
Reference in New Issue
Block a user