- strong cyphering for passwords in db3x_mmap;

- unique signature for the new mmap profiles;

git-svn-id: http://svn.miranda-ng.org/main/trunk@6997 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index e5178bf1b1..7f0455c6f9 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -50,6 +50,8 @@ DBHeader
 #define WSOFS_END   0xFFFFFFFF

 #define WS_ERROR    0xFFFFFFFF

 

+#define DBVT_ENCRYPTED 250

+

 struct DBSignature {

   char name[15];

   BYTE eof;

@@ -151,7 +153,7 @@ struct CDb3Base : public MIDatabase, public MIDatabaseChecker, public MZeroedObj
 

 	__forceinline HANDLE getFile() const { return m_hDbFile; }

 

-protected:

+public:

 	STDMETHODIMP_(void)   SetCacheSafetyMode(BOOL);

 

 	STDMETHODIMP_(LONG)   GetContactCount(void);

@@ -202,9 +204,7 @@ protected:
 	virtual	void  DBFill(DWORD ofs, int bytes) = 0;

 	virtual	void  DBFlush(int setting) = 0;

 	virtual	int   InitCache(void) = 0;

-

-protected:

-	int InitCrypt(void);

+	virtual	int	InitCrypt(void) { return 0; }

 

 public:  // Check functions

 	int WorkInitialChecks(int);

@@ -221,8 +221,6 @@ protected:
 	DWORD    m_ChunkSize;

 	bool     m_safetyMode, m_bReadOnly, m_bEncrypted;

 

-	MICryptoEngine *m_crypto;

-

 	////////////////////////////////////////////////////////////////////////////

 	// database stuff

 public:	

@@ -231,6 +229,8 @@ public:
 	PBYTE    m_pDbCache;

 	HANDLE   m_hMap;

 

+	MICryptoEngine *m_crypto;

+

 protected:

 	DWORD    m_dwFileSize;

 	HANDLE   hSettingChangeEvent, hContactDeletedEvent, hContactAddedEvent;

@@ -305,6 +305,7 @@ protected:
 	virtual	void  DBFill(DWORD ofs, int bytes);

 	virtual	void  DBFlush(int setting);

 	virtual	int   InitCache(void);

+	virtual	int   InitCrypt(void);

 

 protected:

 	PBYTE m_pNull;