From 20ee3b5a4f110f53a73746e18fc0eb0cbbb7845c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 2 Nov 2013 04:32:18 +0100 Subject: Implement the first step towards a more flexible way to support crypto methods --- src/crypto/CMakeLists.txt | 3 + src/crypto/cipher/CMakeLists.txt | 34 +++++++ src/crypto/cipher/aes128_ctr/CMakeLists.txt | 18 ++++ src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 6 ++ .../aes128_ctr/nacl/cipher_aes128_ctr_nacl.c | 76 +++++++++++++++ src/crypto/cipher/ciphers.c.in | 103 +++++++++++++++++++++ 6 files changed, 240 insertions(+) create mode 100644 src/crypto/CMakeLists.txt create mode 100644 src/crypto/cipher/CMakeLists.txt create mode 100644 src/crypto/cipher/aes128_ctr/CMakeLists.txt create mode 100644 src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt create mode 100644 src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c create mode 100644 src/crypto/cipher/ciphers.c.in (limited to 'src/crypto') diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt new file mode 100644 index 0000000..1c78e03 --- /dev/null +++ b/src/crypto/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(cipher) + +set(CRYPTO_SOURCES "${CIPHER_SOURCES}" PARENT_SCOPE) diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt new file mode 100644 index 0000000..00b8560 --- /dev/null +++ b/src/crypto/cipher/CMakeLists.txt @@ -0,0 +1,34 @@ +set(CIPHERS "") + +if(WITH_CIPHER_AES128_CTR) + list(APPEND CIPHERS aes128_ctr) +endif(WITH_CIPHER_AES128_CTR) + +set(CIPHER_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/ciphers.c") + +set(CIPHER_DEFINITIONS "") +set(CIPHER_IMPLS "") +set(CIPHER_LIST "") + +foreach(cipher ${CIPHERS}) + add_subdirectory(${cipher}) + + list(APPEND CIPHER_SOURCES ${IMPL_SOURCES}) + + set(CIPHER_LIST "${CIPHER_LIST}\n{\"${CIPHER_NAME}\", cipher_${cipher}_impls},") + set(CIPHER_IMPLS "${CIPHER_IMPLS}\nstatic const fastd_cipher_t *const cipher_${cipher}_impls[] = {") + + foreach(impl ${IMPLS}) + set(CIPHER_DEFINITIONS "${CIPHER_DEFINITIONS}\nextern const fastd_cipher_t fastd_cipher_${cipher}_${impl};") + set(CIPHER_IMPLS "${CIPHER_IMPLS}&fastd_cipher_${cipher}_${impl}, ") + endforeach(impl) + + set(CIPHER_IMPLS "${CIPHER_IMPLS}NULL};") + +endforeach(cipher) + + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ciphers.c.in ${CMAKE_CURRENT_BINARY_DIR}/ciphers.c) + + +set(CIPHER_SOURCES "${CIPHER_SOURCES}" PARENT_SCOPE) diff --git a/src/crypto/cipher/aes128_ctr/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/CMakeLists.txt new file mode 100644 index 0000000..6237a7c --- /dev/null +++ b/src/crypto/cipher/aes128_ctr/CMakeLists.txt @@ -0,0 +1,18 @@ +set(IMPLS "") + +if(WITH_CIPHER_AES128_CTR_NACL) + list(APPEND IMPLS nacl) +endif(WITH_CIPHER_AES128_CTR_NACL) + +set(IMPL_SOURCES "") + +foreach(impl ${IMPLS}) + add_subdirectory(${impl}) + + list(APPEND IMPL_SOURCES $) +endforeach(impl) + + +set(CIPHER_NAME "aes128-ctr" PARENT_SCOPE) +set(IMPLS "${IMPLS}" PARENT_SCOPE) +set(IMPL_SOURCES "${IMPL_SOURCES}" PARENT_SCOPE) diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt new file mode 100644 index 0000000..50e4b4c --- /dev/null +++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt @@ -0,0 +1,6 @@ +include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS}) + +add_library(cipher_aes128_ctr_nacl OBJECT + cipher_aes128_ctr_nacl.c +) +set_property(TARGET method_xsalsa20_poly1305 PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c new file mode 100644 index 0000000..f63e46f --- /dev/null +++ b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c @@ -0,0 +1,76 @@ +/* + Copyright (c) 2012-2013, Matthias Schiffer + 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" +#include + + +struct fastd_cipher_state { + fastd_buffer_t d; +}; + + +static fastd_cipher_context_t* aes128_ctr_initialize(fastd_context_t *ctx UNUSED) { + return NULL; +} + +static fastd_cipher_state_t* aes128_ctr_init_state(fastd_context_t *ctx, const fastd_cipher_context_t *cctx UNUSED, const uint8_t *key) { + fastd_block128_t k; + memcpy(k.b, key, sizeof(fastd_block128_t)); + + fastd_cipher_state_t *state = malloc(sizeof(fastd_cipher_state_t)); + + state->d = fastd_buffer_alloc(ctx, crypto_stream_aes128ctr_BEFORENMBYTES, 0, 0); + crypto_stream_aes128ctr_beforenm(state->d.data, k.b); + + return state; +} + +static bool aes128_ctr_crypt(fastd_context_t *ctx UNUSED, const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const fastd_block128_t *iv) { + crypto_stream_aes128ctr_xor_afternm(out->b, in->b, len, iv->b, state->d.data); + return true; +} + +static void aes128_ctr_free_state(fastd_context_t *ctx UNUSED, fastd_cipher_state_t *state) { + if (state) { + fastd_buffer_free(state->d); + free(state); + } +} + +static void aes128_ctr_free(fastd_context_t *ctx UNUSED, fastd_cipher_context_t *cctx UNUSED) { +} + +const fastd_cipher_t fastd_cipher_aes128_ctr_nacl = { + .name = "nacl", + + .initialize = aes128_ctr_initialize, + .init_state = aes128_ctr_init_state, + .crypt = aes128_ctr_crypt, + + .free_state = aes128_ctr_free_state, + .free = aes128_ctr_free, +}; diff --git a/src/crypto/cipher/ciphers.c.in b/src/crypto/cipher/ciphers.c.in new file mode 100644 index 0000000..ee710f8 --- /dev/null +++ b/src/crypto/cipher/ciphers.c.in @@ -0,0 +1,103 @@ +/* + Copyright (c) 2012-2013, Matthias Schiffer + 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 + + +@CIPHER_DEFINITIONS@ + +typedef struct cipher_impl_list { + const char *name; + const fastd_cipher_t *const *impls; +} cipher_impl_list_t; + +@CIPHER_IMPLS@ + +static const cipher_impl_list_t ciphers[] = { @CIPHER_LIST@ +}; + + +const fastd_cipher_t** fastd_cipher_config_alloc(void) { + const fastd_cipher_t **cipher_conf = calloc(array_size(ciphers), sizeof(const fastd_cipher_t*)); + + size_t i; + for (i = 0; i < array_size(ciphers); i++) + cipher_conf[i] = ciphers[i].impls[0]; + + return cipher_conf; +} + +void fastd_cipher_config_free(const fastd_cipher_t **cipher_conf) { + free(cipher_conf); +} + +bool fastd_cipher_config(const fastd_cipher_t **cipher_conf, const char *name, const char *impl) { + size_t i; + for (i = 0; i < array_size(ciphers); i++) { + if (!strcmp(ciphers[i].name, name)) { + size_t j; + for (j = 0; ciphers[i].impls[j]; j++) { + if (!strcmp(ciphers[i].impls[j]->name, impl)) { + cipher_conf[i] = ciphers[i].impls[j]; + return true; + } + } + + return false; + } + } + + return false; +} + +void fastd_cipher_init(fastd_context_t *ctx) { + ctx->cipher_contexts = calloc(array_size(ciphers), sizeof(fastd_cipher_context_t*)); + + size_t i; + for (i = 0; i < array_size(ciphers); i++) + ctx->cipher_contexts[i] = ctx->conf->ciphers[i]->initialize(ctx); +} + +void fastd_cipher_free(fastd_context_t *ctx) { + size_t i; + for (i = 0; i < array_size(ciphers); i++) + ctx->conf->ciphers[i]->free(ctx, ctx->cipher_contexts[i]); + + free(ctx->cipher_contexts); +} + +bool fastd_cipher_get_by_name(fastd_context_t *ctx, const char *name, const fastd_cipher_t **cipher, fastd_cipher_context_t **cctx) { + size_t i; + for (i = 0; i < array_size(ciphers); i++) { + if (!strcmp(ciphers[i].name, name)) { + *cipher = ctx->conf->ciphers[i]; + *cctx = ctx->cipher_contexts[i]; + return true; + } + } + + return false; +} -- cgit v1.2.3