Skip to content

With write encryptionn requirement #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 1, 2021
Merged

With write encryptionn requirement #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions src/utility/ATT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
case ATT_OP_ERROR:
#ifdef _BLE_TRACE_
Serial.println("[Info] data error");
// Serial.print("Error: ");
// btct.printBytes(data, dlen);
#endif
error(connectionHandle, dlen, data);
break;
Expand Down Expand Up @@ -559,6 +561,7 @@ bool ATTClass::handleNotify(uint16_t handle, const uint8_t* value, int length)
memcpy(&notification[notificationLength], value, length);
notificationLength += length;

/// TODO: Set encyption requirement on notify.
HCI.sendAclPkt(_peers[i].connectionHandle, ATT_CID, notificationLength, notification);

numNotifications++;
Expand Down Expand Up @@ -1214,6 +1217,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
uint8_t* value = &data[sizeof(handle)];

BLELocalAttribute* attribute = GATT.attribute(handle - 1);
bool holdResponse = false;

if (attribute->type() == BLETypeCharacteristic) {
BLELocalCharacteristic* characteristic = (BLELocalCharacteristic*)attribute;
Expand All @@ -1226,10 +1230,33 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
}
return;
}
// Check permssion
if((characteristic->properties() & BLEProperty::BLEAuth)> 0 && (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
holdResponse = true;
sendError(connectionHandle, ATT_OP_WRITE_REQ, handle, ATT_ECODE_INSUFF_ENC);
}

for (int i = 0; i < ATT_MAX_PEERS; i++) {
if (_peers[i].connectionHandle == connectionHandle) {
characteristic->writeValue(BLEDevice(_peers[i].addressType, _peers[i].address), value, valueLength);
if(holdResponse){

writeBufferSize = 0;
memcpy(writeBuffer, &handle, 2);
writeBufferSize+=2;

writeBuffer[writeBufferSize++] = _peers[i].addressType;

memcpy(&writeBuffer[writeBufferSize], _peers[i].address, sizeof(_peers[i].address));
writeBufferSize += sizeof(_peers[i].address);

writeBuffer[writeBufferSize] = valueLength;
writeBufferSize += sizeof(valueLength);

memcpy(&writeBuffer[writeBufferSize], value, valueLength);
writeBufferSize += valueLength;
}else{
characteristic->writeValue(BLEDevice(_peers[i].addressType, _peers[i].address), value, valueLength);
}
break;
}
}
Expand Down Expand Up @@ -1276,8 +1303,36 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
response[0] = ATT_OP_WRITE_RESP;
responseLength = 1;

HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
if(holdResponse){
memcpy(holdBuffer, response, responseLength);
holdBufferSize = responseLength;
}else{
HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
}
}
}
int ATTClass::processWriteBuffer(){
if(writeBufferSize==0){
return 0;
}

struct __attribute__ ((packed)) WriteBuffer {
uint16_t handle;
uint8_t addressType;
uint8_t address[6];
uint8_t valueLength;
uint8_t value[];
} *writeBufferStruct = (WriteBuffer*)&ATT.writeBuffer;
// uint8_t value[writeBufferStruct->valueLength];
// memcpy(value, writeBufferStruct->value, writeBufferStruct->valueLength);
BLELocalAttribute* attribute = GATT.attribute(writeBufferStruct->handle-1);
BLELocalCharacteristic* characteristic = (BLELocalCharacteristic*)attribute;
#ifdef _BLE_TRACE_
Serial.println("Writing value");
#endif
characteristic->writeValue(BLEDevice(writeBufferStruct->addressType, writeBufferStruct->address), writeBufferStruct->value, writeBufferStruct->valueLength);
writeBufferSize = 0;
return 1;
}

void ATTClass::writeResp(uint16_t connectionHandle, uint8_t dlen, uint8_t data[])
Expand Down
3 changes: 3 additions & 0 deletions src/utility/ATT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ class ATTClass {
virtual int setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
virtual int getPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
uint8_t holdBuffer[64];
uint8_t writeBuffer[64];
uint8_t holdBufferSize;
uint8_t writeBufferSize;
virtual int processWriteBuffer();
private:
virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
Expand Down
16 changes: 12 additions & 4 deletions src/utility/HCI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,13 +666,20 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
#endif
if(encryptionChange->enabled>0){
ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::ENCRYPTED_AES);
if(ATT.writeBufferSize > 0){
ATT.processWriteBuffer();
}
if(ATT.holdBufferSize>0){
#ifdef _BLE_TRACE_
Serial.print("Sending queued response size: ");
Serial.println(ATT.holdBufferSize);
#endif
HCI.sendAclPkt(encryptionChange->connectionHandle, ATT_CID, ATT.holdBufferSize, ATT.holdBuffer);
ATT.holdBufferSize = 0;
}
}else{
ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::NO_ENCRYPTION);
}
if(ATT.holdBufferSize>0){
HCI.sendAclPkt(encryptionChange->connectionHandle, ATT_CID, ATT.holdBufferSize, ATT.holdBuffer);
ATT.holdBufferSize = 0;
}
}
else if (eventHdr->evt == EVT_CMD_COMPLETE)
{
Expand Down Expand Up @@ -940,6 +947,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])

uint8_t Z = 0;
for(int i=0; i<16; i++){
/// TODO: Implement secure random
Nb[i] = rand(); //// Should use ESP or ECCx08
}
#ifdef _BLE_TRACE_
Expand Down