Skip to content

Commit 142e6b9

Browse files
pablogs9BorjaOuterelo
authored andcommitted
Feature/remove security directory (#2)
* Removed security directory * Updated security directory
1 parent 1b4b3dd commit 142e6b9

File tree

5 files changed

+2
-338
lines changed

5 files changed

+2
-338
lines changed

rcl/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ find_package(rcutils REQUIRED)
99
find_package(rmw REQUIRED)
1010
find_package(rmw_implementation REQUIRED)
1111
find_package(rosidl_generator_c REQUIRED)
12-
find_package(tinydir_vendor REQUIRED)
1312

1413
include_directories(include)
1514
include(cmake/rcl_set_symbol_visibility_hidden.cmake)
@@ -56,7 +55,6 @@ set(${PROJECT_NAME}_sources
5655
src/rcl/timer.c
5756
src/rcl/validate_topic_name.c
5857
src/rcl/wait.c
59-
src/rcl/security_directory.c
6058
)
6159

6260
add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources})
@@ -68,7 +66,6 @@ ament_target_dependencies(${PROJECT_NAME}
6866
"rcutils"
6967
"rosidl_generator_c"
7068
${RCL_LOGGING_IMPL}
71-
"tinydir_vendor"
7269
)
7370

7471
# Causes the visibility macros to use dllexport rather than dllimport,

rcl/include/rcl/security_directory.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

rcl/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
<build_depend>rcl_interfaces</build_depend>
1717
<build_depend>rcutils</build_depend>
1818
<build_depend>rosidl_generator_c</build_depend>
19-
<build_depend>tinydir_vendor</build_depend>
2019

2120
<build_export_depend>rcl_interfaces</build_export_depend>
2221
<build_export_depend>rcutils</build_export_depend>
2322
<build_export_depend>rosidl_generator_c</build_export_depend>
24-
<build_export_depend>tinydir_vendor</build_export_depend>
2523

2624
<exec_depend>rcl_interfaces</exec_depend>
2725
<exec_depend>ament_cmake</exec_depend>

rcl/src/rcl/node.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C"
2929
#include "rcl/logging_rosout.h"
3030
#include "rcl/rcl.h"
3131
#include "rcl/remap.h"
32-
#include "rcl/security_directory.h"
32+
#include "rcutils/security_directory.h"
3333
#include "rcutils/filesystem.h"
3434
#include "rcutils/find.h"
3535
#include "rcutils/format_string.h"
@@ -307,7 +307,7 @@ rcl_node_init(
307307
node_security_options.enforce_security = RMW_SECURITY_ENFORCEMENT_PERMISSIVE;
308308
} else { // if use_security
309309
// File discovery magic here
310-
node_secure_root = rcl_get_secure_root(name, local_namespace_, allocator);
310+
node_secure_root = rcutils_get_secure_root(name, local_namespace_, allocator);
311311
if (node_secure_root) {
312312
RCUTILS_LOG_INFO_NAMED(ROS_PACKAGE_NAME, "Found security directory: %s", node_secure_root);
313313
node_security_options.security_root_path = node_secure_root;

rcl/src/rcl/security_directory.c

Lines changed: 0 additions & 264 deletions
This file was deleted.

0 commit comments

Comments
 (0)