summaryrefslogtreecommitdiffstats
path: root/src/crypto/cipher/salsa2012
diff options
context:
space:
mode:
Diffstat (limited to 'src/crypto/cipher/salsa2012')
-rw-r--r--src/crypto/cipher/salsa2012/CMakeLists.txt2
-rw-r--r--src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c4
-rw-r--r--src/crypto/cipher/salsa2012/salsa2012.c33
3 files changed, 34 insertions, 5 deletions
diff --git a/src/crypto/cipher/salsa2012/CMakeLists.txt b/src/crypto/cipher/salsa2012/CMakeLists.txt
index 405ae9a..eb853e0 100644
--- a/src/crypto/cipher/salsa2012/CMakeLists.txt
+++ b/src/crypto/cipher/salsa2012/CMakeLists.txt
@@ -1,2 +1,2 @@
-fastd_cipher(salsa2012)
+fastd_cipher(salsa2012 salsa2012.c)
add_subdirectory(nacl)
diff --git a/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c
index 2703f0e..36985a6 100644
--- a/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c
+++ b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c
@@ -60,10 +60,6 @@ static void salsa2012_free(fastd_context_t *ctx UNUSED, fastd_cipher_context_t *
}
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,
diff --git a/src/crypto/cipher/salsa2012/salsa2012.c b/src/crypto/cipher/salsa2012/salsa2012.c
new file mode 100644
index 0000000..780702d
--- /dev/null
+++ b/src/crypto/cipher/salsa2012/salsa2012.c
@@ -0,0 +1,33 @@
+/*
+ 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 "../../../crypto.h"
+
+
+const fastd_cipher_info_t fastd_cipher_info_salsa2012 = {
+ .key_length = 32,
+ .iv_length = 8,
+};