Skip to content

Commit

Permalink
SQLyog 13.1.3 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
wydeep committed Jun 25, 2019
1 parent 09f00d6 commit 16fe6de
Show file tree
Hide file tree
Showing 274 changed files with 51,071 additions and 475 deletions.
23 changes: 9 additions & 14 deletions build/SQLyogCommunity.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;../include/cryptlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x600;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -108,7 +108,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;ssleay32MD.lib;libeay32MD.lib;wevtapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;ssleay32MD.lib;libeay32MD.lib;wevtapi.lib;cryptlib.lib;tinyxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCMT;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
Expand All @@ -126,7 +126,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;../include/cryptlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_WIN32_WINNT=0x501;COMMUNITY;UNICODE;_UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -137,7 +137,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;cryptlib.lib;tinyxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCMT; LIBC;LIBCD;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
Expand All @@ -158,7 +158,7 @@
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;../include/cryptlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x600;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
Expand All @@ -171,7 +171,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;wevtapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;wevtapi.lib;cryptlib.lib;tinyxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCD;msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
Expand All @@ -192,7 +192,7 @@
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../include;../include/scintilla;../include/mysql;../include/htmlayout;../include/pcre;../include/tinyxml;../include/vld;../include/cryptlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_WIN32_WINNT=0x501;SCI_LEXER;STATIC_BUILD;COMMUNITY;_UNICODE;UNICODE;PCRE_STATIC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
Expand All @@ -205,7 +205,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shfolder.lib;version.lib;Ws2_32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;comctl32.lib;htmlhelp.lib;wininet.lib;imm32.lib;gdiplus.lib;ole32.lib;msimg32.lib;sqlite3.lib;mariadbclient.lib;HTMLayout.lib;pcre.lib;Rpcrt4.lib;shlwapi.lib;vld.lib;winmm.lib;cryptlib.lib;tinyxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCD.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
Expand Down Expand Up @@ -382,10 +382,6 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\tinyxml\tinystr.cpp" />
<ClCompile Include="..\src\tinyxml\tinyxml.cpp" />
<ClCompile Include="..\src\tinyxml\tinyxmlerror.cpp" />
<ClCompile Include="..\src\tinyxml\tinyxmlparser.cpp" />
<ClCompile Include="..\src\TunnelCommunity.cpp" />
<ClCompile Include="..\src\UpgradeCheck.cpp" />
<ClCompile Include="..\src\UrlEncode.cpp" />
Expand Down Expand Up @@ -503,8 +499,7 @@
<ClInclude Include="..\include\TabResult.h" />
<ClInclude Include="..\include\TabTableData.h" />
<ClInclude Include="..\include\TabTypes.h" />
<ClInclude Include="..\include\tinyxml\tinystr.h" />
<ClInclude Include="..\include\tinyxml\tinyxml.h" />
<ClInclude Include="..\include\tinyxml\tinyxml2.h" />
<ClInclude Include="..\include\Tunnel.h" />
<ClInclude Include="..\include\TunnelCommunity.h" />
<ClInclude Include="..\include\UpgradeCheck.h" />
Expand Down
24 changes: 3 additions & 21 deletions build/SQLyogCommunity.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<Filter Include="Header Files\tinyxml">
<UniqueIdentifier>{e0ae8f8b-7667-4836-b7dd-25f4d7f82934}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\tinyxml">
<UniqueIdentifier>{124cf439-cdf7-4c76-a8e7-1266d239e8c2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\AutoCompleteInterface.cpp">
Expand Down Expand Up @@ -300,18 +297,6 @@
<ClCompile Include="..\src\TabPreview.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tinyxml\tinyxmlparser.cpp">
<Filter>Source Files\tinyxml</Filter>
</ClCompile>
<ClCompile Include="..\src\tinyxml\tinystr.cpp">
<Filter>Source Files\tinyxml</Filter>
</ClCompile>
<ClCompile Include="..\src\tinyxml\tinyxml.cpp">
<Filter>Source Files\tinyxml</Filter>
</ClCompile>
<ClCompile Include="..\src\tinyxml\tinyxmlerror.cpp">
<Filter>Source Files\tinyxml</Filter>
</ClCompile>
<ClCompile Include="..\src\wyTheme.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -671,12 +656,6 @@
<ClInclude Include="..\include\TableTabInterfaceTabMgmt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\tinyxml\tinyxml.h">
<Filter>Header Files\tinyxml</Filter>
</ClInclude>
<ClInclude Include="..\include\tinyxml\tinystr.h">
<Filter>Header Files\tinyxml</Filter>
</ClInclude>
<ClInclude Include="..\include\wyTheme.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -716,6 +695,9 @@
<ClInclude Include="..\include\TabCheck.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\tinyxml\tinyxml2.h">
<Filter>Header Files\tinyxml</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\include\bitmaps\about.ico">
Expand Down
28 changes: 25 additions & 3 deletions include/CommonHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

#define FMT_SPACE_4 " "


#define REGKEY "Use any UUID here"


Expand Down Expand Up @@ -568,6 +567,8 @@ wyInt32 GetBitFieldColumnWidth(wyString &strcreate, wyInt32 fieldpos);
*/
wyInt32 GetModuleNameLength();

wyBool GetModuleDir(wyString &path);

//Gets the mysql specific escaped value.
/**
@param tunnel : IN Tunnel pointer
Expand Down Expand Up @@ -949,14 +950,14 @@ wyBool IsDatatypeNumeric(wyString &datatype);
@param text : IN String to decode
@returns wyTrue on success
*/
wyBool DecodePassword(wyString &text);
wyBool DecodePassword_Absolute(wyString &text);

/// Encoding of password
/**
@param text : IN String to decode
@returns wyTrue on success
*/
wyBool EncodePassword(wyString &text);
wyBool EncodePassword_Absolute(wyString &text);

/// Rotate string left , bitwise
/**
Expand All @@ -976,6 +977,27 @@ void RemoveDefiner(wyString &text, const wyChar* pattern, wyInt32 extra);

void RemoveBrackets(wyString &text, const wyChar* pattern);

/// Encryption of password
/**
@param text : IN String to decode
@returns wyTrue on success
*/
wyBool EncodePassword(wyString &text);

/// Decoding of password
/**
@param text : IN String to decode
@returns wyTrue on success
*/
wyBool DecodePassword(wyString &text);

//Encrypt the password
wyBool MigrateAllPassword(wyString conn, wyString dirstr);

wyBool MigratePassword(wyString conn, wyString dirstr, wyString &pwdstr);

wyBool MigratePassword(wyString &pwdstr);

//void DebugLog(const char *buffer);
#ifdef _WIN32
void WriteLog(const wyChar* str);
Expand Down
4 changes: 4 additions & 0 deletions include/ConnectionBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ class ConnectionBase
/// Status bar original window procedure
WNDPROC m_wpstatusbarorigproc;

wyBool m_isencrypted_clone;


public:

Expand Down Expand Up @@ -908,6 +910,8 @@ class ConnectionBase
//array for connection color
wyInt32 *m_arrayofcolor;

wyBool CopyAndRename(wyString& directorystr, wyString& fullpathstr, wyString& newpath);

};

#endif
8 changes: 5 additions & 3 deletions include/FrameWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class ListOfOpenQueryTabs : public wyElem
TabType tabtype;
ListOfOpenQueryTabs()
{
tabname = "";
tabname.SetAs("");
seqofquerytab = 1;
seqofquerybuilder = 1;
seqofschemadesigner = 1;
Expand All @@ -138,7 +138,7 @@ class MDIListForDropDrown : public wyElem
//TabModule * m_hwndTabModuleinlist;
MDIListForDropDrown()
{
name = "";
name.SetAs("");
opentab = new List();
}
};
Expand Down Expand Up @@ -187,7 +187,7 @@ class ListofOpenTabs : public wyElem
TabModule * m_hwndTabModuleinlist;
ListofOpenTabs()
{
name = "";
name.SetAs("");

}
};
Expand Down Expand Up @@ -1746,6 +1746,7 @@ class FrameWindow
wyBool SaveConnectionDetails2(wySQLite *ssnsqliteobj = NULL);
wyBool SaveSessionFile(HWND hwnd, wyBool issaveas);
wyBool OpenSessionFile();
void MigratePasswordofSessionFile(wyString filename);
wyString m_sessionfile;
wyString m_sessionname;
wyString m_previoussessionfile;
Expand All @@ -1755,6 +1756,7 @@ class FrameWindow
wyBool WriteTabDetailsToTempList(tabeditorelem *temptabeditorele, CTCITEM quetabitem, wyInt32 tabid, wyInt32 position, wyInt32 id,TabTypes *tabqueryactive, MDIWindow *wnd);
wyBool SetStatusParts2(HWND hwndstatus);
wyInt32 OnStatusBarWmCtlColorStatic(HWND hwnd, WPARAM wparam, LPARAM lparam);
void CreateIniFileBackup();
HFONT m_trialtextfont;
HFONT m_trialbuyfont;
//HBRUSH m_trialbuybrush;
Expand Down
4 changes: 4 additions & 0 deletions include/Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ typedef struct __struct_tunnelauth
bool isproxy;
bool ischallenge;
bool isbase64encode;
bool isencrypted;

wchar_t proxy[128];
wchar_t proxyusername[128];
Expand Down Expand Up @@ -447,6 +448,9 @@ struct ConnectionInfo

//persist info tab
wyBool m_isInfoOpen;

wyUInt32 m_isencrypted;

};


Expand Down
10 changes: 1 addition & 9 deletions include/SQLyog.rc
Original file line number Diff line number Diff line change
Expand Up @@ -850,14 +850,6 @@ BEGIN
END
END

IDR_CONNDROPDOWNMENU MENU
BEGIN
POPUP "connection drop down list"
BEGIN
MENUITEM " a", IDM_DROPDOWNLISTITEM
END
END

IDR_INFOTABMENU MENU
BEGIN
POPUP "Object"
Expand Down Expand Up @@ -905,7 +897,7 @@ BEGIN
PUSHBUTTON "&Rename...",IDC_EDITCONN,267,9,46,15,WS_DISABLED
PUSHBUTTON "&Delete",IDC_DELETE,318,9,46,15,WS_DISABLED
LTEXT "Sa&ved Connections",IDC_DESCSTATIC,113,32,69,9,WS_DISABLED
CONTROL "",IDC_DESC,"CustomComboBox1",WS_DISABLED | WS_TABSTOP | 0x10,180,30,184,15
CONTROL "",IDC_DESC,"CustomComboBox1", WS_DISABLED | WS_TABSTOP| CBS_DROPDOWN | 0x10,180,30,184,15
CONTROL "Tab1",IDC_CONNTAB,"SysTabControl32",TCS_HOTTRACK | WS_DISABLED | WS_GROUP | WS_TABSTOP,113,50,251,181
LTEXT "MyS&QL Host Address",IDC_MYSQLHOSTST,119,74,70,9,WS_DISABLED
EDITTEXT IDC_DLGCONNECT_HOST,190,72,166,12,ES_AUTOHSCROLL | WS_DISABLED
Expand Down
6 changes: 3 additions & 3 deletions include/Version.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define MAJOR_VERSION_INT 13
#define MINOR_VERSION_INT 1
#define UPDATE_VERSION_INT 1
#define RELEASE_VERSION_INT 0
#define EXTRAINFO ""
#define UPDATE_VERSION_INT 3
#define RELEASE_VERSION_INT 0
#define EXTRAINFO " "
63 changes: 63 additions & 0 deletions include/cryptlib/3way.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// 3way.h - originally written and placed in the public domain by Wei Dai

/// \file 3way.h
/// \brief Classes for the 3-Way block cipher

#ifndef CRYPTOPP_THREEWAY_H
#define CRYPTOPP_THREEWAY_H

#include "config.h"
#include "seckey.h"
#include "secblock.h"

NAMESPACE_BEGIN(CryptoPP)

/// \brief ThreeWay block cipher information
struct ThreeWay_Info : public FixedBlockSize<12>, public FixedKeyLength<12>, public VariableRounds<11>
{
CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "3-Way";}
};

/// \brief ThreeWay block cipher
/// \sa <a href="http://www.cryptopp.com/wiki/3-Way">3-Way</a>
class ThreeWay : public ThreeWay_Info, public BlockCipherDocumentation
{
/// \brief Class specific implementation and overrides used to operate the cipher.
/// \details Implementations and overrides in \p Base apply to both \p ENCRYPTION and \p DECRYPTION directions
class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<ThreeWay_Info>
{
public:
void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);

protected:
unsigned int m_rounds;
FixedSizeSecBlock<word32, 3> m_k;
};

/// \brief Class specific methods used to operate the cipher in the forward direction.
/// \details Implementations and overrides in \p Enc apply to \p ENCRYPTION.
class CRYPTOPP_NO_VTABLE Enc : public Base
{
public:
void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
};

/// \brief Class specific methods used to operate the cipher in the reverse direction.
/// \details Implementations and overrides in \p Dec apply to \p DECRYPTION.
class CRYPTOPP_NO_VTABLE Dec : public Base
{
public:
void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
};

public:
typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
};

typedef ThreeWay::Encryption ThreeWayEncryption;
typedef ThreeWay::Decryption ThreeWayDecryption;

NAMESPACE_END

#endif
Loading

0 comments on commit 16fe6de

Please sign in to comment.