From ed160e841b49d9f9e59541356372a1ccb0ad6962 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Tue, 22 Oct 2019 02:39:16 +0200
Subject: [PATCH] Fix salsa20 header not using extern C when using in c++

---
 thirdparty/salsa20/salsa20.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/thirdparty/salsa20/salsa20.h b/thirdparty/salsa20/salsa20.h
index bf553384..42d35d4a 100644
--- a/thirdparty/salsa20/salsa20.h
+++ b/thirdparty/salsa20/salsa20.h
@@ -8,6 +8,10 @@ Public domain.
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct salsa20_ctx
 {
     uint32_t m_input[16];
@@ -15,7 +19,7 @@ typedef struct salsa20_ctx
 
 /*
  * Initializes the context with the chosen key.
- * 
+ *
  * ctx: The context to initialize.
  * key: A pointer to the key bytes.
  * keySize: The length of the key in bits. Has to be 128 or 256.
@@ -25,7 +29,7 @@ void Salsa20_KeySetup(salsa20_ctx_t* ctx, const uint8_t* key, uint32_t keySize);
 /*
  * Initializes or changes the IV of the context.
  * Can be called multiple times on the same context in order to encrypt/decrypt messages with the same key but different IV's.
- * 
+ *
  * ctx: The context to initialize.
  * iv: A pointer to the IV bytes. Must be 64 bits long.
  */
@@ -34,7 +38,7 @@ void Salsa20_IVSetup(salsa20_ctx_t* ctx, const uint8_t* iv);
 /*
  * Encrypts the specified amount of plain text and writes it to the cipher text buffer.
  * The cipher text buffer and the plain text buffer can be the same.
- * 
+ *
  * ctx: The context that was previously initialized with a key and IV.
  * cipherText: A pointer to the cipher text buffer which must at least be msgLen bytes.
  * plainText: A pointer to the plain text buffer which must at least be msgLen bytes.
@@ -46,10 +50,14 @@ void Salsa20_Encrypt_Bytes(salsa20_ctx_t* ctx, const uint8_t* plainText, uint8_t
  * Decrypts the specified amount of cipher text and writes it to the plain text buffer.
  * The cipher text buffer and the plain text buffer can be the same.
  * Internally just calls the encryption method.
- * 
+ *
  * ctx: The context that was previously initialized with a key and IV.
  * cipherText: A pointer to the cipher text buffer which must at least be msgLen bytes.
  * plainText: A pointer to the plain text buffer which must at least be msgLen bytes.
  * msgLen: The amount of bytes to decrypt.
  */
-void Salsa20_Decrypt_Bytes(salsa20_ctx_t* ctx, const uint8_t* cipherText, uint8_t* plainText, uint32_t msgLen);
\ No newline at end of file
+void Salsa20_Decrypt_Bytes(salsa20_ctx_t* ctx, const uint8_t* cipherText, uint8_t* plainText, uint32_t msgLen);
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file