Skip to content
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

Fix nested designators. #252

Merged
merged 2 commits into from
Feb 11, 2025
Merged

Fix nested designators. #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e37be2
Fix nested designators.
kubalaguna Feb 11, 2025
4f0dbe6
Merge branch 'main' into main
kubalaguna Feb 11, 2025
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
10 changes: 5 additions & 5 deletions Source/santad/Logs/EndpointSecurity/Serializers/BasicStringTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ - (void)testSerializeMessageAuthenticationOD {
es_event_authentication_t auth = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_OD,
.data.od = &od,
.data = {.od = &od},
};

esMsg.event.authentication = &auth;
Expand Down Expand Up @@ -635,7 +635,7 @@ - (void)testSerializeMessageAuthenticationTouchID {
.instigator = &instigatorProc,
.touchid_mode = ES_TOUCHID_MODE_VERIFICATION,
.has_uid = true,
.uid.uid = NOBODY_UID,
.uid = {.uid = NOBODY_UID},
#if HAVE_MACOS_15
.instigator_token = MakeAuditToken(654, 321),
#endif
Expand All @@ -644,7 +644,7 @@ - (void)testSerializeMessageAuthenticationTouchID {
es_event_authentication_t auth = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_TOUCHID,
.data.touchid = &touchid,
.data = {.touchid = &touchid},
};

esMsg.event.authentication = &auth;
Expand Down Expand Up @@ -710,7 +710,7 @@ - (void)testSerializeMessageAuthenticationToken {
es_event_authentication_t auth = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_TOKEN,
.data.token = &token,
.data = {.token = &token},
};

esMsg.event.authentication = &auth;
Expand Down Expand Up @@ -781,7 +781,7 @@ - (void)testSerializeMessageAuthenticationAutoUnlock {
es_event_authentication_t auth = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_AUTO_UNLOCK,
.data.auto_unlock = &auto_unlock,
.data = {.auto_unlock = &auto_unlock},
};

esMsg.event.authentication = &auth;
Expand Down
8 changes: 4 additions & 4 deletions Source/santad/Logs/EndpointSecurity/Serializers/ProtobufTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ - (void)testSerializeMessageAuthenticationOD {
__block es_event_authentication_t authenticationEvent = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_OD,
.data.od = &authenticationOD,
.data = {.od = &authenticationOD},
};

[self serializeAndCheckEvent:ES_EVENT_TYPE_NOTIFY_AUTHENTICATION
Expand Down Expand Up @@ -1163,7 +1163,7 @@ - (void)testSerializeMessageAuthenticationTouchID {
__block es_event_authentication_t authenticationEvent = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_TOUCHID,
.data.touchid = &authenticationTouchID,
.data = {.touchid = &authenticationTouchID},
};

[self serializeAndCheckEvent:ES_EVENT_TYPE_NOTIFY_AUTHENTICATION
Expand Down Expand Up @@ -1218,7 +1218,7 @@ - (void)testSerializeMessageAuthenticationToken {
__block es_event_authentication_t authenticationEvent = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_TOKEN,
.data.token = &authenticationToken,
.data = {.token = &authenticationToken},
};

[self serializeAndCheckEvent:ES_EVENT_TYPE_NOTIFY_AUTHENTICATION
Expand Down Expand Up @@ -1267,7 +1267,7 @@ - (void)testSerializeMessageAuthenticationAutoUnlock {
__block es_event_authentication_t authenticationEvent = {
.success = true,
.type = ES_AUTHENTICATION_TYPE_AUTO_UNLOCK,
.data.auto_unlock = &authenticationAutoUnlock,
.data = {.auto_unlock = &authenticationAutoUnlock},
};

[self serializeAndCheckEvent:ES_EVENT_TYPE_NOTIFY_AUTHENTICATION
Expand Down