diff options
| -rw-r--r-- | src/crypto/cipher/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/crypto/cipher/salsa2012/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/crypto/cipher/salsa2012/nacl/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c | 74 |
4 files changed, 83 insertions, 0 deletions
diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt index a68fece..b538227 100644 --- a/src/crypto/cipher/CMakeLists.txt +++ b/src/crypto/cipher/CMakeLists.txt @@ -39,6 +39,7 @@ endmacro(fastd_cipher_impl_require) add_subdirectory(aes128_ctr) add_subdirectory(blowfish_ctr) add_subdirectory(null) +add_subdirectory(salsa2012) add_subdirectory(salsa20) diff --git a/src/crypto/cipher/salsa2012/CMakeLists.txt b/src/crypto/cipher/salsa2012/CMakeLists.txt new file mode 100644 index 0000000..405ae9a --- /dev/null +++ b/src/crypto/cipher/salsa2012/CMakeLists.txt @@ -0,0 +1,2 @@ +fastd_cipher(salsa2012) +add_subdirectory(nacl) diff --git a/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt b/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt new file mode 100644 index 0000000..3d47621 --- /dev/null +++ b/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt @@ -0,0 +1,6 @@ +fastd_cipher_impl(salsa2012 nacl + salsa2012_nacl.c +) +fastd_cipher_impl_include_directories(salsa2012 nacl ${NACL_INCLUDE_DIRS}) +fastd_cipher_impl_link_libraries(salsa2012 nacl ${NACL_LIBRARIES}) +fastd_cipher_impl_require(salsa2012 nacl NACL) diff --git a/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c new file mode 100644 index 0000000..edf5843 --- /dev/null +++ b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c @@ -0,0 +1,74 @@ +/* + 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" +#include <crypto_stream_salsa2012.h> + + +struct __attribute__((aligned(16))) fastd_cipher_state { + uint8_t key[crypto_stream_salsa2012_KEYBYTES]; +}; + + +static fastd_cipher_context_t* salsa2012_initialize(fastd_context_t *ctx UNUSED) { + return NULL; +} + +static fastd_cipher_state_t* salsa2012_init_state(fastd_context_t *ctx UNUSED, const fastd_cipher_context_t *cctx UNUSED, const uint8_t *key) { + fastd_cipher_state_t *state = malloc(sizeof(fastd_cipher_state_t)); + memcpy(state->key, key, crypto_stream_salsa2012_KEYBYTES); + + return state; +} + +static bool salsa2012_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 uint8_t *iv) { + crypto_stream_salsa2012_xor(out->b, in->b, len, iv, state->key); + return true; +} + +static void salsa2012_free_state(fastd_context_t *ctx UNUSED, fastd_cipher_state_t *state) { + if (state) { + secure_memzero(state, sizeof(*state)); + free(state); + } +} + +static void salsa2012_free(fastd_context_t *ctx UNUSED, fastd_cipher_context_t *cctx UNUSED) { +} + +const fastd_cipher_t fastd_cipher_salsa2012_nacl = { + .name = "nacl", + .key_length = crypto_stream_salsa2012_KEYBYTES, + .iv_length = crypto_stream_salsa2012_NONCEBYTES, + + .initialize = salsa2012_initialize, + .init_state = salsa2012_init_state, + + .crypt = salsa2012_crypt, + + .free_state = salsa2012_free_state, + .free = salsa2012_free, +}; |