080-wireguard-0058-crypto-lib-chacha20poly1305-Add-missing-function-dec.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Herbert Xu <[email protected]>
  3. Date: Wed, 8 Jul 2020 12:41:13 +1000
  4. Subject: [PATCH] crypto: lib/chacha20poly1305 - Add missing function
  5. declaration
  6. commit 06cc2afbbdf9a9e8df3e2f8db724997dd6e1b4ac upstream.
  7. This patch adds a declaration for chacha20poly1305_selftest to
  8. silence a sparse warning.
  9. Signed-off-by: Herbert Xu <[email protected]>
  10. Signed-off-by: Jason A. Donenfeld <[email protected]>
  11. ---
  12. include/crypto/chacha20poly1305.h | 2 ++
  13. lib/crypto/chacha20poly1305.c | 2 --
  14. 2 files changed, 2 insertions(+), 2 deletions(-)
  15. --- a/include/crypto/chacha20poly1305.h
  16. +++ b/include/crypto/chacha20poly1305.h
  17. @@ -45,4 +45,6 @@ bool chacha20poly1305_decrypt_sg_inplace
  18. const u64 nonce,
  19. const u8 key[CHACHA20POLY1305_KEY_SIZE]);
  20. +bool chacha20poly1305_selftest(void);
  21. +
  22. #endif /* __CHACHA20POLY1305_H */
  23. --- a/lib/crypto/chacha20poly1305.c
  24. +++ b/lib/crypto/chacha20poly1305.c
  25. @@ -21,8 +21,6 @@
  26. #define CHACHA_KEY_WORDS (CHACHA_KEY_SIZE / sizeof(u32))
  27. -bool __init chacha20poly1305_selftest(void);
  28. -
  29. static void chacha_load_key(u32 *k, const u8 *in)
  30. {
  31. k[0] = get_unaligned_le32(in);