Skip to content

Upstream #1

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
judepereira merged 7 commits into from
Feb 28, 2021
Merged

Upstream #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db954a7
Update EspHap_WindowCovering.ino
eford321 Feb 25, 2021
deed83a
Update EspHap_GarageDoor.ino
eford321 Feb 25, 2021
abf6182
Merge pull request #60 from eford321/patch-2
Yurik72 Feb 27, 2021
80f677b
Merge pull request #59 from eford321/patch-1
Yurik72 Feb 27, 2021
ef460f9
Merge pull request #62 from judepereira/master
Yurik72 Feb 27, 2021
c2fb8d2
memory leak fix on esp32
Yurik72 Feb 27, 2021
abee258
Merge branch 'master' of https://github.com/Yurik72/ESPHap
Yurik72 Feb 27, 2021
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
Binary file modified .vs/ESPHap/v15/.suo
View file
Open in desktop
Binary file not shown.
Binary file modified .vs/slnx.sqlite
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions arduino_homekit_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,6 +2073,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
tlv_free(decrypted_message);
pair_verify_context_free(context->verify_context);
context->verify_context = NULL;

send_tlv_error_response(context, 4, TLVError_Authentication);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/EspHap_GarageDoor/EspHap_GarageDoor.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern "C"{
#ifdef ESP8266
#include "homekitintegrationcpp.h"
#endif
#include <hapfilestorage\hapfilestorage.hpp>
#include <hapfilestorage/hapfilestorage.hpp>



Expand Down
2 changes: 1 addition & 1 deletion examples/EspHap_WindowCovering/EspHap_WindowCovering.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern "C"{
#ifdef ESP8266
#include "homekitintegrationcpp.h"
#endif
#include <hapfilestorage\hapfilestorage.hpp>
#include <hapfilestorage/hapfilestorage.hpp>



Expand Down
2 changes: 1 addition & 1 deletion homeintegration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "storage.h"
#include "storage_ex.h"

#define MAX_SERVICES 20
//#define MAX_SERVICES 20


static callback_storagechanged callbackstorage_integration=NULL;
Expand Down
7 changes: 4 additions & 3 deletions server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,6 +1966,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
CLIENT_ERROR(context, "Failed to verify device signature (code %d)", r);

pair_verify_context_free(context->verify_context);
homekit_storage_pairing_free(pairing);
context->verify_context = NULL;

send_tlv_error_response(context, 4, TLVError_Authentication);
Expand All @@ -1991,7 +1992,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,

pair_verify_context_free(context->verify_context);
context->verify_context = NULL;

homekit_storage_pairing_free(pairing);
send_tlv_error_response(context, 4, TLVError_Unknown);
break;
}
Expand All @@ -2012,7 +2013,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
if (r) {
CLIENT_ERROR(context, "Failed to derive write encryption key (code %d)", r);


homekit_storage_pairing_free(pairing);
send_tlv_error_response(context, 4, TLVError_Unknown);
break;
}
Expand All @@ -2025,7 +2026,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
context->pairing_id = pairing_id;
context->permissions = permissions;
context->encrypted = true;

homekit_storage_pairing_free(pairing);
HOMEKIT_NOTIFY_EVENT(context->server, HOMEKIT_EVENT_CLIENT_VERIFIED);

CLIENT_INFO(context, "Verification successful, secure session established");
Expand Down