From 04beb6dc3ca878aab48f283c1dc6699ca6a8a27b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 27 Jan 2014 16:50:00 +0100 Subject: Add an aligned uint8_t type data_t and use it to ensure the alignment of various buffers on the stack --- src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/methods/xsalsa20_poly1305') diff --git a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c index 365f435..5e0c7b2 100644 --- a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c +++ b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c @@ -34,7 +34,7 @@ struct fastd_method_session_state { fastd_method_common_t common; - uint8_t key[crypto_secretbox_xsalsa20poly1305_KEYBYTES]; + data_t key[crypto_secretbox_xsalsa20poly1305_KEYBYTES]; }; @@ -121,7 +121,7 @@ static bool method_encrypt(fastd_context_t *ctx, fastd_peer_t *peer UNUSED, fast *out = fastd_buffer_alloc(ctx, in.len, 0, 0); - uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {}; + data_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {}; memcpy_nonce(nonce, session->common.send_nonce); crypto_secretbox_xsalsa20poly1305(out->data, in.data, in.len, nonce, session->key); @@ -151,7 +151,7 @@ static bool method_decrypt(fastd_context_t *ctx, fastd_peer_t *peer, fastd_metho if (flags) return false; - uint8_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {}; + data_t nonce[crypto_secretbox_xsalsa20poly1305_NONCEBYTES] = {}; memcpy_nonce(nonce, in_nonce); fastd_buffer_pull_head_zero(ctx, &in, crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES); -- cgit v1.2.3