From 4865a3c0f7598e994db2f57b0335794e6ebc5e41 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 9 Apr 2020 23:51:04 +0200 Subject: [PATCH 1/3] security-context -> enclave Signed-off-by: Mikael Arguedas --- rmw/include/rmw/init_options.h | 2 +- rmw/include/rmw/rmw.h | 10 +++++----- rmw/src/init_options.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rmw/include/rmw/init_options.h b/rmw/include/rmw/init_options.h index 06265357..0bfa68c8 100644 --- a/rmw/include/rmw/init_options.h +++ b/rmw/include/rmw/init_options.h @@ -55,7 +55,7 @@ typedef struct RMW_PUBLIC_TYPE rmw_init_options_t /// Enable localhost only rmw_localhost_only_t localhost_only; /// Security context - char * security_context; + char * enclave; // TODO(wjwwood): replace with rmw_allocator_t when that refactor happens /// Allocator used during internal allocation of init options, if needed. diff --git a/rmw/include/rmw/rmw.h b/rmw/include/rmw/rmw.h index 64e929ab..45fcef43 100644 --- a/rmw/include/rmw/rmw.h +++ b/rmw/include/rmw/rmw.h @@ -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 diff --git a/rmw/src/init_options.c b/rmw/src/init_options.c index f8c2ab4a..204a7a12 100644 --- a/rmw/src/init_options.c +++ b/rmw/src/init_options.c @@ -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 } From 7e1085590f6d86fe356ca819fe0c465dbec0a809 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Fri, 10 Apr 2020 12:27:03 +0200 Subject: [PATCH 2/3] 'Security context' -> 'Enclave' Signed-off-by: Mikael Arguedas --- rmw/include/rmw/init_options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmw/include/rmw/init_options.h b/rmw/include/rmw/init_options.h index 0bfa68c8..b6a11fdf 100644 --- a/rmw/include/rmw/init_options.h +++ b/rmw/include/rmw/init_options.h @@ -54,7 +54,7 @@ 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 + /// Enclave char * enclave; // TODO(wjwwood): replace with rmw_allocator_t when that refactor happens From 86f20124049a9ca95ea25a7e291c6b6876d71abb Mon Sep 17 00:00:00 2001 From: Ivan Santiago Paunovic Date: Mon, 13 Apr 2020 10:26:23 -0300 Subject: [PATCH 3/3] Add more extensive doc string Signed-off-by: Ivan Santiago Paunovic --- rmw/include/rmw/init_options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmw/include/rmw/init_options.h b/rmw/include/rmw/init_options.h index b6a11fdf..45ad24b8 100644 --- a/rmw/include/rmw/init_options.h +++ b/rmw/include/rmw/init_options.h @@ -54,7 +54,7 @@ typedef struct RMW_PUBLIC_TYPE rmw_init_options_t rmw_security_options_t security_options; /// Enable localhost only rmw_localhost_only_t localhost_only; - /// Enclave + /// Enclave, name used to find security artifacts in a sros2 keystore. char * enclave; // TODO(wjwwood): replace with rmw_allocator_t when that refactor happens