summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config.c32
-rw-r--r--src/methods/CMakeLists.txt13
-rw-r--r--src/methods/methods.c.in44
3 files changed, 58 insertions, 31 deletions
diff --git a/src/config.c b/src/config.c
index 7958ffb..1d9df10 100644
--- a/src/config.c
+++ b/src/config.c
@@ -42,25 +42,6 @@
extern const fastd_protocol_t fastd_protocol_ec25519_fhmqvc;
-extern const fastd_method_t fastd_method_null;
-#ifdef WITH_METHOD_XSALSA20_POLY1305
-extern const fastd_method_t fastd_method_xsalsa20_poly1305;
-#endif
-#ifdef WITH_METHOD_AES128_GCM
-extern const fastd_method_t fastd_method_aes128_gcm;
-#endif
-
-static const fastd_method_t *const METHODS[] = {
- &fastd_method_null,
-#ifdef WITH_METHOD_XSALSA20_POLY1305
- &fastd_method_xsalsa20_poly1305,
-#endif
-#ifdef WITH_METHOD_AES128_GCM
- &fastd_method_aes128_gcm,
-#endif
- NULL
-};
-
#ifdef USE_CRYPTO_AES128CTR
#ifdef WITH_CRYPTO_AES128CTR_NACL
@@ -142,16 +123,6 @@ bool fastd_config_protocol(fastd_context_t *ctx UNUSED, fastd_config_t *conf, co
return true;
}
-const fastd_method_t* fastd_parse_method_name(const char *name) {
- int i;
- for (i = 0; METHODS[i]; i++) {
- if (!strcmp(METHODS[i]->name, name))
- return METHODS[i];
- }
-
- return NULL;
-}
-
bool fastd_config_method(fastd_context_t *ctx, fastd_config_t *conf, const char *name) {
const fastd_method_t *parsed_method = fastd_parse_method_name(name);
@@ -618,7 +589,8 @@ void fastd_configure(fastd_context_t *ctx, fastd_config_t *conf, int argc, char
if (!conf->methods) {
pr_warn(ctx, "no encryption method configured, falling back to method `null' (unencrypted)");
- conf->methods = fastd_string_stack_dup(fastd_method_null.name);
+ if (!fastd_config_method(ctx, conf, "null"))
+ exit_bug(ctx, "method `null' not supported");
}
ctx->conf = conf;
diff --git a/src/methods/CMakeLists.txt b/src/methods/CMakeLists.txt
index 3ef410b..c5a6273 100644
--- a/src/methods/CMakeLists.txt
+++ b/src/methods/CMakeLists.txt
@@ -12,15 +12,26 @@ if(WITH_METHOD_AES128_GCM)
endif(WITH_METHOD_AES128_GCM)
-set(METHOD_SOURCES "")
+set(METHOD_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/methods.c")
+
+set(METHOD_DEFINITIONS "")
+set(METHOD_LIST "")
foreach(method ${METHODS})
add_subdirectory(${method})
+
list(APPEND METHOD_SOURCES $<TARGET_OBJECTS:method_${method}>)
+
+ set(METHOD_DEFINITIONS "${METHOD_DEFINITIONS}\nextern const fastd_method_t fastd_method_${method};")
+ set(METHOD_LIST "${METHOD_LIST}\n&fastd_method_${method},")
endforeach(method)
if(METHOD_COMMON)
list(APPEND METHOD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/common.c)
endif(METHOD_COMMON)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/methods.c.in ${CMAKE_CURRENT_BINARY_DIR}/methods.c)
+
+
set(METHOD_SOURCES "${METHOD_SOURCES}" PARENT_SCOPE)
diff --git a/src/methods/methods.c.in b/src/methods/methods.c.in
new file mode 100644
index 0000000..f402b51
--- /dev/null
+++ b/src/methods/methods.c.in
@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2012-2013, Matthias Schiffer <mschiffer@universe-factory.net>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#include <fastd.h>
+
+
+@METHOD_DEFINITIONS@
+
+static const fastd_method_t *const methods[] = { @METHOD_LIST@
+};
+
+
+const fastd_method_t* fastd_parse_method_name(const char *name) {
+ int i;
+ for (i = 0; methods[i]; i++) {
+ if (!strcmp(methods[i]->name, name))
+ return methods[i];
+ }
+
+ return NULL;
+}