aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/include
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-12-05 13:18:17 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2019-12-05 14:54:46 +0100
commit12b4b2210c1783437b602a6ebcef242b422b30d8 (patch)
tree1c99c578078f1c4d0780ee3de53e996415fac582 /src/crypto/include
parentnetlink: prepare for removal of genl_family_attrbuf in 5.5 (diff)
downloadwireguard-monolithic-historical-12b4b2210c1783437b602a6ebcef242b422b30d8.tar.xz
wireguard-monolithic-historical-12b4b2210c1783437b602a6ebcef242b422b30d8.zip
chacha20poly1305: port to sgmitter for 5.5
I'm not totally comfortable with these changes yet, and it'll require some more scrutiny. But it's a start.
Diffstat (limited to '')
-rw-r--r--src/crypto/include/zinc/chacha20poly1305.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/crypto/include/zinc/chacha20poly1305.h b/src/crypto/include/zinc/chacha20poly1305.h
index ce72740..e3339f0 100644
--- a/src/crypto/include/zinc/chacha20poly1305.h
+++ b/src/crypto/include/zinc/chacha20poly1305.h
@@ -22,9 +22,9 @@ void chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,
const u64 nonce,
const u8 key[CHACHA20POLY1305_KEY_SIZE]);
-bool __must_check chacha20poly1305_encrypt_sg(
- struct scatterlist *dst, struct scatterlist *src, const size_t src_len,
- const u8 *ad, const size_t ad_len, const u64 nonce,
+bool __must_check chacha20poly1305_encrypt_sg_inplace(
+ struct scatterlist *src, const size_t src_len, const u8 *ad,
+ const size_t ad_len, const u64 nonce,
const u8 key[CHACHA20POLY1305_KEY_SIZE], simd_context_t *simd_context);
bool __must_check
@@ -32,9 +32,9 @@ chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,
const u8 *ad, const size_t ad_len, const u64 nonce,
const u8 key[CHACHA20POLY1305_KEY_SIZE]);
-bool __must_check chacha20poly1305_decrypt_sg(
- struct scatterlist *dst, struct scatterlist *src, const size_t src_len,
- const u8 *ad, const size_t ad_len, const u64 nonce,
+bool __must_check chacha20poly1305_decrypt_sg_inplace(
+ struct scatterlist *src, size_t src_len, const u8 *ad,
+ const size_t ad_len, const u64 nonce,
const u8 key[CHACHA20POLY1305_KEY_SIZE], simd_context_t *simd_context);
void xchacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,