Skip to content

Commit fd85e97

Browse files
utelleutelle
committed
Add AEGIS cipher scheme
For now, the AEGIS cipher scheme is experimental. Incompatible changes may occur without prior notice. Do not use for production.
1 parent 08edcd9 commit fd85e97

File tree

156 files changed

+20104
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+20104
-182
lines changed

‎build/sqlite3mc_dll.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I../src
22+
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_dllicu.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I../src -I"$(LIBICU_PATH)/include"
22+
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include -I"$(LIBICU_PATH)/include"
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_lib.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I../src
22+
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_libicu.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I../src -I"$(LIBICU_PATH)/include"
22+
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include -I"$(LIBICU_PATH)/include"
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_vc10_dll.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118
<PrecompiledHeader>NotUsing</PrecompiledHeader>
119119
<WarningLevel>Level3</WarningLevel>
120120
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122122
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
123123
<Optimization>Disabled</Optimization>
124124
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
125125
</ClCompile>
126126
<ResourceCompile>
127127
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129129
</ResourceCompile>
130130
<Link>
131131
<SubSystem>Windows</SubSystem>
@@ -138,14 +138,14 @@
138138
<PrecompiledHeader>NotUsing</PrecompiledHeader>
139139
<WarningLevel>Level3</WarningLevel>
140140
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142142
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
143143
<Optimization>Disabled</Optimization>
144144
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
145145
</ClCompile>
146146
<ResourceCompile>
147147
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149149
</ResourceCompile>
150150
<Link>
151151
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
158158
<PrecompiledHeader>NotUsing</PrecompiledHeader>
159159
<WarningLevel>Level3</WarningLevel>
160160
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
161+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
162162
<Optimization>Full</Optimization>
163163
<FunctionLevelLinking>true</FunctionLevelLinking>
164164
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -168,7 +168,7 @@
168168
</ClCompile>
169169
<ResourceCompile>
170170
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
172172
</ResourceCompile>
173173
<Link>
174174
<SubSystem>Windows</SubSystem>
@@ -182,7 +182,7 @@
182182
<PrecompiledHeader>NotUsing</PrecompiledHeader>
183183
<WarningLevel>Level3</WarningLevel>
184184
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
186186
<Optimization>Full</Optimization>
187187
<FunctionLevelLinking>true</FunctionLevelLinking>
188188
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -192,7 +192,7 @@
192192
</ClCompile>
193193
<ResourceCompile>
194194
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;SQLITE_API=__declspec(dllexport);CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_ENABLE_PREUPDATE_HOOK=1;SQLITE_ENABLE_SESSION=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE3MC_SECURE_MEMORY=$(SQLITE3MC_SECURE_MEMORY);SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195-
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
195+
<AdditionalIncludeDirectories>..\src;..\src\aegis\include;..\src\argon2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
196196
</ResourceCompile>
197197
<Link>
198198
<SubSystem>Windows</SubSystem>

0 commit comments

Comments
 (0)