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.

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

Remove obsolete support for security #2535

Merged
merged 2 commits into from Mar 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 0 additions & 23 deletions CMakeLists.txt
Expand Up @@ -133,8 +133,6 @@ hpx_option(HPX_WITH_HWLOC
"Use Hwloc for hardware topology information and thread pinning. If disabled, performance might be reduced."
ON ADVANCED)

hpx_option(HPX_WITH_SECURITY BOOL "Enable security support via libsodium." OFF)

# Logging configuration
hpx_option(HPX_WITH_LOGGING BOOL
"Build HPX with logging enabled (default: ON)."
Expand Down Expand Up @@ -1417,27 +1415,6 @@ if(HPX_WITH_VALGRIND)
hpx_add_config_define(HPX_HAVE_VALGRIND)
endif()

################################################################################
# Security, libsodium: P(ortable|ackageable) NaCl
################################################################################
if(HPX_WITH_SECURITY)
find_package(Sodium)
if(NOT SODIUM_FOUND)
hpx_error("Sodium could not be found and WITH_SODIUM=On, please specify Sodium_ROOT to point to the root of your Sodium installation")
endif()
hpx_add_config_define(HPX_HAVE_SODIUM)

include_directories(${SODIUM_INCLUDE_DIR})

if(MSVC)
hpx_add_config_define(SODIUM_STATIC)
endif()
hpx_libraries(${SODIUM_LIBRARIES})

hpx_add_config_define(HPX_HAVE_SECURITY)
endif()
################################################################################

################################################################################
# Check Build Options based on the found dependencies. We also check for errors
# with incompatible options with the currently selected platform.
Expand Down
38 changes: 0 additions & 38 deletions cmake/FindSodium.cmake

This file was deleted.

2 changes: 0 additions & 2 deletions docs/manual/build_system/cmake_variables.qbk
Expand Up @@ -58,7 +58,6 @@ The options are split into these categories:
* [link build_system.cmake_variables.HPX_WITH_NATIVE_TLS HPX_WITH_NATIVE_TLS]
* [link build_system.cmake_variables.HPX_WITH_PARCEL_COALESCING HPX_WITH_PARCEL_COALESCING]
* [link build_system.cmake_variables.HPX_WITH_RUN_MAIN_EVERYWHERE HPX_WITH_RUN_MAIN_EVERYWHERE]
* [link build_system.cmake_variables.HPX_WITH_SECURITY HPX_WITH_SECURITY]
* [link build_system.cmake_variables.HPX_WITH_STATIC_LINKING HPX_WITH_STATIC_LINKING]
* [link build_system.cmake_variables.HPX_WITH_SYCL HPX_WITH_SYCL]
* [link build_system.cmake_variables.HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY]
Expand Down Expand Up @@ -95,7 +94,6 @@ The options are split into these categories:
[[[#build_system.cmake_variables.HPX_WITH_NATIVE_TLS] `HPX_WITH_NATIVE_TLS:BOOL`][Use native TLS support if available (default: ON)]]
[[[#build_system.cmake_variables.HPX_WITH_PARCEL_COALESCING] `HPX_WITH_PARCEL_COALESCING:BOOL`][Enable the parcel coalescing plugin (default: ON).]]
[[[#build_system.cmake_variables.HPX_WITH_RUN_MAIN_EVERYWHERE] `HPX_WITH_RUN_MAIN_EVERYWHERE:BOOL`][Run hpx_main by default on all localities (default: OFF).]]
[[[#build_system.cmake_variables.HPX_WITH_SECURITY] `HPX_WITH_SECURITY:BOOL`][Enable security support via libsodium.]]
[[[#build_system.cmake_variables.HPX_WITH_STATIC_LINKING] `HPX_WITH_STATIC_LINKING:BOOL`][Compile HPX statically linked libraries (Default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_SYCL] `HPX_WITH_SYCL:BOOL`][Enable sycl support (default: OFF)]]
[[[#build_system.cmake_variables.HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY] `HPX_WITH_TRANSFORM_REDUCE_COMPATIBILITY:BOOL`][Enable old overloads for transform_reduce and inner_product (default: ON)]]
Expand Down
30 changes: 0 additions & 30 deletions docs/manual/existing_performance_counters.qbk
Expand Up @@ -298,36 +298,6 @@ system and application performance.
as its parameter. In this case the counter will report the serialization
time for the given action only.]
]
[ [`/security/time/<connection_type>/<operation>`

where:[br] `<operation>` is one of the following:
`sent`, `received`[br]
`<connection_type>` is one of the following: `tcp`, `mpi`
]
[`locality#*/total`

where:[br] `*` is the locality id of the locality the time spent for
security related operation should be queried for. The locality id is
a (zero based) number identifying the locality.
]
[Returns the overall time spent performing outgoing security operations
for the specified `<connection_type>`on the given locality (see
`<operation>`, e.g. `sent` or `received`).

The performance counters for the connection type `mpi` are available
only if the compile time constant `HPX_HAVE_PARCELPORT_MPI` was
defined while compiling the __hpx__ core library (which is not defined
by default, the corresponding cmake configuration constant is
`HPX_WITH_PARCELPORT_MPI`).

These performance counters are available only if the compile time constant
`HPX_HAVE_SECURITY` was defined while compiling the __hpx__ core library
(which is not defined by default, the corresponding cmake configuration
constant is `HPX_WITH_SECURITY`).

Please see __cmake_options__ for more details.]
[None]
]
[ [`/parcels/count/routed`
]
[`locality#*/total`
Expand Down
191 changes: 0 additions & 191 deletions hpx/components/security/capability.hpp

This file was deleted.