summaryrefslogtreecommitdiffstats
path: root/src/methods
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-11-30 08:34:21 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-11-30 08:34:21 +0100
commit57d5ec7368773242a26bad69885d86a65af7b142 (patch)
tree1ea8a62ce72677ca93cf4a61aa9be9b61427bc81 /src/methods
parent60d7347aa664c473661bc5528b2b036c4141896f (diff)
downloadfastd-57d5ec7368773242a26bad69885d86a65af7b142.tar
fastd-57d5ec7368773242a26bad69885d86a65af7b142.zip
xsalsa20-poly1305: partly convert to the new method helpers
Diffstat (limited to 'src/methods')
-rw-r--r--src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
index 19a929d..43a5041 100644
--- a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
+++ b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
@@ -89,24 +89,21 @@ static void method_session_free(fastd_context_t *ctx UNUSED, fastd_method_sessio
}
}
+
static bool method_encrypt(fastd_context_t *ctx, fastd_peer_t *peer UNUSED, fastd_method_session_state_t *session, fastd_buffer_t *out, fastd_buffer_t in) {
- fastd_buffer_pull_head(ctx, &in, crypto_secretbox_xsalsa20poly1305_ZEROBYTES);
- memset(in.data, 0, crypto_secretbox_xsalsa20poly1305_ZEROBYTES);
+ fastd_buffer_pull_head_zero(ctx, &in, crypto_secretbox_xsalsa20poly1305_ZEROBYTES);
*out = fastd_buffer_alloc(ctx, in.len, 0, 0);
- uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES];
+ uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {};
memcpy(nonce, session->common.send_nonce, COMMON_NONCEBYTES);
- memset(nonce+COMMON_NONCEBYTES, 0, crypto_secretbox_xsalsa20poly1305_NONCEBYTES-COMMON_NONCEBYTES);
crypto_secretbox_xsalsa20poly1305(out->data, in.data, in.len, nonce, session->key);
fastd_buffer_free(in);
- fastd_buffer_push_head(ctx, out, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES-COMMON_HEADBYTES);
- memcpy(out->data, session->common.send_nonce, COMMON_NONCEBYTES);
- /* flags are 0, no need to set */
-
+ fastd_buffer_push_head(ctx, out, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES);
+ fastd_method_put_common_header(ctx, out, session->common.send_nonce, 0);
fastd_method_increment_nonce(&session->common);
return true;
@@ -119,19 +116,19 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho
if (!method_session_is_valid(ctx, session))
return false;
- if (((const uint8_t*)in.data)[COMMON_NONCEBYTES]) /* flags */
+ uint8_t in_nonce[COMMON_NONCEBYTES];
+ uint8_t flags;
+ int64_t age;
+ if (!fastd_method_handle_common_header(ctx, &session->common, &in, in_nonce, &flags, &age))
return false;
- uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES];
- memcpy(nonce, in.data, COMMON_NONCEBYTES);
- memset(nonce+COMMON_NONCEBYTES, 0, crypto_secretbox_xsalsa20poly1305_NONCEBYTES-COMMON_NONCEBYTES);
-
- int64_t age;
- if (!fastd_method_is_nonce_valid(ctx, &session->common, nonce, &age))
+ if (flags)
return false;
- fastd_buffer_pull_head(ctx, &in, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES-COMMON_HEADBYTES);
- memset(in.data, 0, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES);
+ uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {};
+ memcpy(nonce, in_nonce, COMMON_NONCEBYTES);
+
+ fastd_buffer_pull_head_zero(ctx, &in, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES);
*out = fastd_buffer_alloc(ctx, in.len, 0, 0);
@@ -139,8 +136,8 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho
fastd_buffer_free(*out);
/* restore input buffer */
- fastd_buffer_push_head(ctx, &in, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES-COMMON_HEADBYTES);
- memcpy(in.data, nonce, COMMON_NONCEBYTES);
+ fastd_buffer_push_head(ctx, &in, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES);
+ fastd_method_put_common_header(ctx, &in, in_nonce, 0);
return false;
}
@@ -156,6 +153,7 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho
return true;
}
+
const fastd_method_provider_t fastd_method_xsalsa20_poly1305 = {
.max_overhead = COMMON_HEADBYTES + crypto_secretbox_xsalsa20poly1305_ZEROBYTES - crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES,