Skip to content

security-context -> enclave #211

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 3 commits into from
Apr 13, 2020
Merged

security-context -> enclave #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4865a3c
security-context -> enclave
mikaelarguedas Apr 9, 2020
7e10855
'Security context' -> 'Enclave'
mikaelarguedas Apr 10, 2020
86f2012
Add more extensive doc string
ivanpauno Apr 13, 2020
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
4 changes: 2 additions & 2 deletions rmw/include/rmw/init_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ typedef struct RMW_PUBLIC_TYPE rmw_init_options_t
rmw_security_options_t security_options;
/// Enable localhost only
rmw_localhost_only_t localhost_only;
/// Security context
char * security_context;
/// Enclave, name used to find security artifacts in a sros2 keystore.
char * enclave;

// TODO(wjwwood): replace with rmw_allocator_t when that refactor happens
/// Allocator used during internal allocation of init options, if needed.
Expand Down
10 changes: 5 additions & 5 deletions rmw/include/rmw/rmw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,25 +1048,25 @@ rmw_get_node_names(
rcutils_string_array_t * node_names,
rcutils_string_array_t * node_namespaces);

/// Return a list of node name and namespaces discovered via a node with its security context.
/// Return a list of node name and namespaces discovered via a node with its enclave.
/**
* Similar to \ref rmw_get_node_names, but it also provides the security context name.
* Similar to \ref rmw_get_node_names, but it also provides the enclave name.
*
* \param[in] node the handle to the node being used to query the ROS graph
* \param[out] node_names a list of discovered node names
* \param[out] node_namespaces a list of discovered node namespaces
* \param[out] security_contexts list of discovered nodes' security context names
* \param[out] enclaves list of discovered nodes' enclave names
* \return `RMW_RET_OK` if node the query was made successfully, or
* \return `RMW_RET_ERROR` if an unspecified error occurs.
*/
RMW_PUBLIC
RMW_WARN_UNUSED
rmw_ret_t
rmw_get_node_names_with_security_contexts(
rmw_get_node_names_with_enclaves(
const rmw_node_t * node,
rcutils_string_array_t * node_names,
rcutils_string_array_t * node_namespaces,
rcutils_string_array_t * security_contexts);
rcutils_string_array_t * enclaves);

RMW_PUBLIC
RMW_WARN_UNUSED
Expand Down
2 changes: 1 addition & 1 deletion rmw/src/init_options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rmw_get_zero_initialized_init_options(void)
.implementation_identifier = NULL,
.impl = NULL,
.instance_id = 0,
.security_context = NULL,
.enclave = NULL,
.security_options = rmw_get_default_security_options(),
}; // NOLINT(readability/braces): false positive
}
Expand Down