XChaCha20-Poly1305 via libsodium

src/DumpProto/CMakeLists.txt

@@ -1,10 +1,18 @@
 file(GLOB_RECURSE FILE_SOURCES "*.h" "*.c" "*.cpp")
 
+# Use tea.cpp from EterBase instead of maintaining a local copy
+list(APPEND FILE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../EterBase/tea.cpp")
+
 add_executable(DumpProto ${FILE_SOURCES})
 set_target_properties(DumpProto PROPERTIES
 	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
+target_include_directories(DumpProto PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/../EterBase
+)
+
 target_link_libraries(DumpProto
 	lzo2
-)
+	sodium
+)

src/DumpProto/dump_proto.cpp

@@ -10,6 +10,7 @@
 #include <cstring>
 #include <io.h>
 #include <direct.h>
+#include <sodium.h>
 
 #include "lzo.h"
 
@@ -1152,7 +1153,13 @@ int main(int argc, char ** argv)
 
 	printf("=== MAIN START ===\n");
 	fflush(stdout);
-	
+
+	if (sodium_init() < 0)
+	{
+		fprintf(stderr, "sodium_init() failed\n");
+		return 1;
+	}
+
 	if (BuildMobTable())
 	{
 		printf("=== BuildMobTable returned TRUE ===\n");

src/DumpProto/tea.cpp

@@ -1,100 +0,0 @@
-/*
-*    Filename: tea.c
-* Description: TEA 암호화 모듈
-*
-*      Author: 김한주 (aka. 비엽, Cronan), 송영진 (aka. myevan, 빗자루)
-*/
-#include "tea.h"
-#include <memory.h>
-
-/*
-* TEA Encryption Module Instruction
-*					Edited by 김한주 aka. 비엽, Cronan
-*
-* void tea_code(const unsigned long sz, const unsigned long sy, const unsigned long *key, unsigned long *dest)
-* void tea_decode(const unsigned long sz, const unsigned long sy, const unsigned long *key, unsigned long *dest)
-*   8바이트를 암호/복호화 할때 사용된다. key 는 16 바이트여야 한다.
-*   sz, sy 는 8바이트의 역순으로 대입한다. 
-* 
-* int tea_decrypt(unsigned long *dest, const unsigned long *src, const unsigned long *key, int size);
-* int tea_encrypt(unsigned long *dest, const unsigned long *src, const unsigned long *key, int size);
-*   한꺼번에 8 바이트 이상을 암호/복호화 할때 사용한다. 만약 size 가
-*   8의 배수가 아니면 8의 배수로 크기를 "늘려서" 암호화 한다. 
-*
-* ex. tea_code(pdwSrc[1], pdwSrc[0], pdwKey, pdwDest);
-*     tea_decrypt(pdwDest, pdwSrc, pdwKey, nSize);
-*/
-
-#define TEA_ROUND		32		// 32 를 권장하며, 높을 수록 결과가 난해해 진다.
-#define DELTA			0x9E3779B9	// DELTA 값 바꾸지 말것.
-
-void tea_code(const unsigned long sz, const unsigned long sy, const unsigned long *key, unsigned long *dest)
-{
-	register unsigned long y = sy, z = sz, sum = 0;
-	unsigned long		n = TEA_ROUND;
-	
-	while (n-- > 0)
-	{
-		y	+= ((z << 4 ^ z >> 5) + z) ^ (sum + key[sum & 3]);
-		sum	+= DELTA;
-		z	+= ((y << 4 ^ y >> 5) + y) ^ (sum + key[sum >> 11 & 3]);
-	}
-	
-	*(dest++)	= y;
-	*dest	= z;
-}
-
-void tea_decode(const unsigned long sz, const unsigned long sy, const unsigned long *key, unsigned long *dest)
-{
-#pragma warning(disable:4307)
-	register unsigned long y = sy, z = sz, sum = DELTA * TEA_ROUND;
-#pragma warning(default:4307)
-
-	unsigned long		n = TEA_ROUND;
-	
-	while (n-- > 0)
-	{
-		z -= ((y << 4 ^ y >> 5) + y) ^ (sum + key[sum >> 11 & 3]);
-		sum -= DELTA;
-		y -= ((z << 4 ^ z >> 5) + z) ^ (sum + key[sum & 3]);
-	}
-	
-	*(dest++)	= y;
-	*dest	= z;
-}
-
-int tea_encrypt(unsigned long *dest, const unsigned long *src, const unsigned long * key, int size)
-{
-	int		i;
-	int		resize;
-	
-	if (size % 8 != 0)
-	{
-		resize = size + 8 - (size % 8);
-		memset((char *) src + size, 0, resize - size);
-	}
-	else
-		resize = size;
-	
-	for (i = 0; i < resize >> 3; i++, dest += 2, src += 2)
-		tea_code(*(src + 1), *src, key, dest);
-	
-	return (resize);
-}
-
-int tea_decrypt(unsigned long *dest, const unsigned long *src, const unsigned long * key, int size)
-{
-	int		i;
-	int		resize;
-	
-	if (size % 8 != 0)
-		resize = size + 8 - (size % 8);
-	else
-		resize = size;
-	
-	for (i = 0; i < resize >> 3; i++, dest += 2, src += 2)
-		tea_decode(*(src + 1), *src, key, dest);
-	
-	return (resize);
-}
-

src/DumpProto/tea.h

@@ -1,17 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /* TEA is a 64-bit symmetric block cipher with a 128-bit key, developed
-       by David J. Wheeler and Roger M. Needham, and described in their
-       paper at <URL:http://www.cl.cam.ac.uk/ftp/users/djw3/tea.ps>.
-
-       This implementation is based on their code in
-       <URL:http://www.cl.cam.ac.uk/ftp/users/djw3/xtea.ps> */
-
-    int tea_encrypt(unsigned long *dest, const unsigned long *src, const unsigned long *key, int size);
-    int tea_decrypt(unsigned long *dest, const unsigned long *src, const unsigned long *key, int size);
-
-#ifdef __cplusplus
-};
-#endif