64-bit compatible version of CryptoPP

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

6 files changed, 48 insertions, 293 deletions

diff --git a/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.dll b/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.dll
deleted file mode 100644
index 90a7a2abfc..0000000000
--- a/plugins/CryptoPP/src/PGPw/Release6/PGPsdkW6.dll
+++ /dev/null
diff --git a/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.dll b/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.dll
deleted file mode 100644
index f026dde7fd..0000000000
--- a/plugins/CryptoPP/src/PGPw/Release8/PGPsdkW8.dll
+++ /dev/null
diff --git a/plugins/CryptoPP/src/PGPw/commonheaders.cpp b/plugins/CryptoPP/src/PGPw/commonheaders.cpp
deleted file mode 100644
index 763395fcd6..0000000000
--- a/plugins/CryptoPP/src/PGPw/commonheaders.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "commonheaders.h"

-

-LPCSTR szModuleName = MODULENAME;

-LPCSTR szVersionStr = MODULENAME" DLL ("__VERSION_STRING")";

-HINSTANCE g_hInst;

diff --git a/plugins/CryptoPP/src/PGPw/commonheaders.h b/plugins/CryptoPP/src/PGPw/commonheaders.h
deleted file mode 100644
index 8c79d2ec5c..0000000000
--- a/plugins/CryptoPP/src/PGPw/commonheaders.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Windows API

-

-#pragma once

-//#define WIN32_LEAN_AND_MEAN

-//#pragma warning(disable: 4078)

-

-#include <windows.h>

-//#include <afxwin.h>

-#include <commdlg.h>

-#include "..\version.h"

-

-#pragma comment(linker,"/merge:.rdata=.text")

-#pragma comment(linker,"/entry:dllmain")

-#pragma comment(linker,"/nodefaultlib")

-#pragma comment(linker,"/subsystem:windows")

-#pragma optimize("gsy", on)

-

-// PGP API

-#ifndef PGP_WIN32

-#error Define PGP_WIN32 to SDK version (e.g. 0x658)

-#endif

-

-#include <pgpEncode.h>

-#include <pgpErrors.h>

-#include <pgpKeys.h>

-#include <pgpOptionList.h>

-#include <pgpUserInterface.h>

-#include <pgpUtilities.h>

-#include <pgpFeatures.h>

-

-

-#define MODULENAME "PGPsdk"

-BOOL ShowSelectKeyringsDlg(HWND,LPSTR,LPSTR);

-

-extern LPCSTR szModuleName;

-extern LPCSTR szVersionStr;

-extern HINSTANCE g_hInst;

-

-

-#define DLLEXPORT __declspec(dllexport)

-

-extern "C" DLLEXPORT int   __cdecl _pgp_init(void);

-extern "C" DLLEXPORT int   __cdecl _pgp_done(void);

-extern "C" DLLEXPORT int   __cdecl _pgp_open_keyrings(LPSTR,LPSTR);

-extern "C" DLLEXPORT int   __cdecl _pgp_close_keyrings(void);

-extern "C" DLLEXPORT int   __cdecl _pgp_get_version(void);

-extern "C" DLLEXPORT LPSTR __cdecl _pgp_get_error(void);

-extern "C" DLLEXPORT int   __cdecl _pgp_size_keyid(void);

-extern "C" DLLEXPORT PVOID __cdecl _pgp_select_keyid(HWND,LPSTR);

-extern "C" DLLEXPORT LPSTR __cdecl _pgp_encrypt_keydb(LPCSTR,PVOID);

-extern "C" DLLEXPORT LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR);

-//extern "C" DLLEXPORT int   __cdecl _pgp_check_key(LPCSTR);

-extern "C" DLLEXPORT LPSTR __cdecl _pgp_encrypt_key(LPCSTR,LPCSTR);

-extern "C" DLLEXPORT LPSTR __cdecl _pgp_decrypt_key(LPCSTR,LPCSTR);

-

-/*

-#undef RtlMoveMemory

-#undef RtlFillMemory

-#undef RtlZeroMemory

-

-NTSYSAPI VOID NTAPI RtlMoveMemory(VOID UNALIGNED *Destination, CONST VOID UNALIGNED *Source, SIZE_T Length);

-NTSYSAPI VOID NTAPI RtlFillMemory(VOID UNALIGNED *Destination, SIZE_T Length, BYTE  Fill);

-NTSYSAPI VOID NTAPI RtlZeroMemory(VOID UNALIGNED *Destination, SIZE_T Length);

-*/

diff --git a/plugins/CryptoPP/src/PGPw/pgpw.h b/plugins/CryptoPP/src/PGPw/pgpw.h
new file mode 100644
index 0000000000..9e26090e58
--- /dev/null
+++ b/plugins/CryptoPP/src/PGPw/pgpw.h
@@ -0,0 +1,33 @@
+// Windows API

+

+#pragma once

+

+#include "..\version.h"

+

+// PGP API

+#ifndef PGP_WIN32

+#error Define PGP_WIN32 to SDK version (e.g. 0x658)

+#endif

+

+#undef MODULENAME

+#define MODULENAME "PGPsdk"

+

+BOOL ShowSelectKeyringsDlg(HWND,LPSTR,LPSTR);

+

+extern LPCSTR szModuleName;

+extern LPCSTR szVersionStr;

+extern HINSTANCE g_hInst;

+

+extern "C"  int   __cdecl _pgp_init(void);

+extern "C"  int   __cdecl _pgp_done(void);

+extern "C"  int   __cdecl _pgp_open_keyrings(LPSTR,LPSTR);

+extern "C"  int   __cdecl _pgp_close_keyrings(void);

+extern "C"  int   __cdecl _pgp_get_version(void);

+extern "C"  LPSTR __cdecl _pgp_get_error(void);

+extern "C"  int   __cdecl _pgp_size_keyid(void);

+extern "C"  PVOID __cdecl _pgp_select_keyid(HWND,LPSTR);

+extern "C"  LPSTR __cdecl _pgp_encrypt_keydb(LPCSTR,PVOID);

+extern "C"  LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR);

+extern "C"  int   __cdecl _pgp_check_key(LPCSTR);

+extern "C"  LPSTR __cdecl _pgp_encrypt_key(LPCSTR,LPCSTR);

+extern "C"  LPSTR __cdecl _pgp_decrypt_key(LPCSTR,LPCSTR);

diff --git a/plugins/CryptoPP/src/PGPw/main.cpp b/plugins/CryptoPP/src/PGPw/sdk6.cpp
index 8427046a16..3d9bf47f17 100644
--- a/plugins/CryptoPP/src/PGPw/main.cpp
+++ b/plugins/CryptoPP/src/PGPw/sdk6.cpp
@@ -1,14 +1,22 @@
-#include "commonheaders.h"

+#include "../commonheaders.h"

+

+#define PGP_WIN32 0x600

+

+#include "sdk6/include/pgpEncode.h"

+#include "sdk6/include/pgpErrors.h"

+#include "sdk6/include/pgpKeys.h"

+#include "sdk6/include/pgpOptionList.h"

+#include "sdk6/include/pgpUserInterface.h"

+#include "sdk6/include/pgpUtilities.h"

+#include "sdk6/include/pgpFeatures.h"

+

+#include "pgpw.h"

 

 // pgpsdk.lib pgpsdknl.lib pgpsdkui.lib libcmt.lib

 // /delayload:pgpsdk.dll,pgpsdknl.dll,pgpsdkui.dll

 

 PGPContextRef pgpContext;

-#if (PGP_WIN32 < 0x700)

 PGPKeySetRef pgpKeyDB = 0;

-#else

-PGPKeyDBRef pgpKeyDB = 0;

-#endif

 LPSTR pszPassphrase = 0;

 LPSTR pgpErrMsg = 0;

 #define pgpErrMsgLen 512

@@ -51,19 +59,13 @@ int __cdecl _pgp_init()
 	pgpVer = 0;

 

  	__try {

-#if (PGP_WIN32 < 0x700)

 		if (CheckPGPError(PGPsdkInit()) || CheckPGPError(PGPsdkUILibInit()))  return 0;

 		PGPNewContext(kPGPsdkAPIVersion, &pgpContext);

-#else

-		if (CheckPGPError(PGPsdkInit(0)) || CheckPGPError(PGPsdkUILibInit(0))) return 0;

-		PGPNewContext(kPGPsdk20APIVersion, &pgpContext);

-#endif

 	}

 	__except ( EXCEPTION_EXECUTE_HANDLER ) {

 		return 0;

 	}

 

-#if (PGP_WIN32 < 0x700)

 	PGPGetSDKVersion(&pgpVer);

 	int minor = (pgpVer & 0x000FF000 ) >> 12;

 	switch(PGPMajorVersion(pgpVer)) {

@@ -77,9 +79,6 @@ int __cdecl _pgp_init()
 		pgpVer = 1<<24 | (minor<<16) | (PGPRevVersion(pgpVer)<<8);

 		break;

 	}

-#else

-	pgpVer = PGPGetPGPsdkVersion();

-#endif

 

 	return 1;

 }

@@ -91,11 +90,7 @@ int __cdecl _pgp_done()
 	__try {

 	    if(pgpErrMsg) LocalFree(pgpErrMsg);

 		if (pszPassphrase) PGPFreeData(pszPassphrase);

-#if (PGP_WIN32 < 0x700)

 		if (pgpKeyDB) PGPFreeKeySet(pgpKeyDB);

-#else

-		if (pgpKeyDB) PGPFreeKeyDB(pgpKeyDB);

-#endif

 		PGPFreeContext(pgpContext);

 		PGPsdkUILibCleanup();

 		PGPsdkCleanup();

@@ -114,21 +109,7 @@ int __cdecl _pgp_open_keyrings(LPSTR PubRingPath, LPSTR SecRingPath)
 {

 	_pgp_close_keyrings();

 

-#if (PGP_WIN32 < 0x700)

     PGPError err = PGPOpenDefaultKeyRings(pgpContext, kPGPKeyRingOpenFlags_None, &pgpKeyDB);

-#else

-    if ((!PubRingPath || !*PubRingPath) && !ShowSelectKeyringsDlg(0,PubRingPath,SecRingPath)) {

-		return 0;

-    }

-

-    PGPFileSpecRef PubKeyRing, SecKeyRing;

-    PGPNewFileSpecFromFullPath(pgpContext, PubRingPath, &PubKeyRing);

-    PGPNewFileSpecFromFullPath(pgpContext, SecRingPath, &SecKeyRing);

-

-    PGPError err = PGPOpenKeyDBFile(pgpContext, kPGPOpenKeyDBFileOptions_None, PubKeyRing, SecKeyRing, &pgpKeyDB);

-    PGPFreeFileSpec(SecKeyRing);

-    PGPFreeFileSpec(PubKeyRing);

-#endif

 	if (CheckPGPError(err)) {

 		return 0;

 	}

@@ -138,17 +119,10 @@ int __cdecl _pgp_open_keyrings(LPSTR PubRingPath, LPSTR SecRingPath)
 

 int __cdecl _pgp_close_keyrings()

 {

-#if (PGP_WIN32 < 0x700)

 	if (pgpKeyDB) {

 		PGPFreeKeySet(pgpKeyDB);

 		pgpKeyDB = 0;

 	}

-#else

-	if (pgpKeyDB) {

-		PGPFreeKeyDB(pgpKeyDB);

-		pgpKeyDB = 0;

-	}

-#endif

 	return 1;

 }

 

@@ -175,33 +149,22 @@ LPSTR __cdecl _pgp_encrypt_keydb(LPCSTR szPlainMsg, PVOID pgpKeyID)
 	if (!pgpKeyDB)

 		return 0;

 

-#if (PGP_WIN32 < 0x700)

     PGPFilterRef IDFilter;

     PGPNewKeyIDFilter(pgpContext, RemoteKeyID, &IDFilter);

 

     PGPKeySetRef PublicKey;

     PGPFilterKeySet(pgpKeyDB, IDFilter, &PublicKey);

-#else

-    PGPKeyDBObjRef PublicKey;

-    PGPFindKeyByKeyID(pgpKeyDB, RemoteKeyID, &PublicKey);

-#endif

 

     PGPError err = PGPEncode(pgpContext,

       PGPOInputBuffer(pgpContext, szPlainMsg, lstrlen(szPlainMsg)),

       PGPOArmorOutput(pgpContext, TRUE),

       PGPOAllocatedOutputBuffer(pgpContext, (LPVOID *)&szEncMsg, 16384, (PGPUInt32 *)&dwEncMsgLen),

-#if (PGP_WIN32 < 0x700)

       PGPOEncryptToKeySet(pgpContext, PublicKey),

-#else

-      PGPOEncryptToKeyDBObj(pgpContext, PublicKey),

-#endif

       PGPOVersionString(pgpContext, szVersionStr),

       PGPOLastOption(pgpContext));

 

-#if (PGP_WIN32 < 0x700)

 	PGPFreeKeySet(PublicKey);

 	PGPFreeFilter(IDFilter);

-#endif

 

     if (CheckPGPError(err))

        return 0;

@@ -227,7 +190,7 @@ LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR szEncMsg)
     int iTry = 0;

 

     do {

-		if (!pszPassphrase && 

+		if (!pszPassphrase &&

 			PGPPassphraseDialog(pgpContext,

 								PGPOUIOutputPassphrase(pgpContext, &pszPassphrase),

 								PGPOLastOption(pgpContext)) == kPGPError_UserAbort) {

@@ -238,11 +201,7 @@ LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR szEncMsg)
 	    PGPError err = PGPDecode(pgpContext,

 	       PGPOInputBuffer(pgpContext, szEncMsg, lstrlen(szEncMsg)),

 	       PGPOAllocatedOutputBuffer(pgpContext, (LPVOID *)&szPlainMsg, 16384, (PGPUInt32 *)&dwPlainMsgLen),

-#if (PGP_WIN32 < 0x700)

 		   PGPOKeySetRef(pgpContext, pgpKeyDB),

-#else

-	       PGPOKeyDBRef(pgpContext, pgpKeyDB),

-#endif

 	       PGPOPassphrase(pgpContext, pszPassphrase),

 	       PGPOLastOption(pgpContext));

 

@@ -268,7 +227,6 @@ LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR szEncMsg)
 }

 

 

-#if (PGP_WIN32 < 0x700)

 PGPError _pgp_import_key(PGPKeySetRef *keySet, LPCSTR pgpKey)

 {

     return PGPImportKeySet( pgpContext,

@@ -278,35 +236,6 @@ PGPError _pgp_import_key(PGPKeySetRef *keySet, LPCSTR pgpKey)
                                             lstrlen(pgpKey) ),

                            PGPOLastOption( pgpContext ) );

 }

-#else

-PGPError _pgp_import_key(PGPKeyDBRef *keyDB, LPCSTR pgpKey)

-{

-    return PGPImport( pgpContext,

-                     keyDB,

-                     PGPOInputBuffer( pgpContext,

-                                      pgpKey,

-                                      lstrlen(pgpKey) ),

-                     PGPOLastOption( pgpContext ) );

-}

-#endif

-

-/*

-int __cdecl _pgp_check_key(LPCSTR pgpKey)

-{

-#if (PGP_WIN32 < 0x700)

-	PGPKeySetRef PrivateKey;

-    if (CheckPGPError(_pgp_import_key(&PrivateKey,pgpKey)))

-       return 0;

-	PGPFreeKeySet(PrivateKey);

-#else

-	PGPKeyDBRef PrivateKey;

-    if (CheckPGPError(_pgp_import_key(&PrivateKey,pgpKey)))

-       return 0;

-	PGPFreeKeyDB(PrivateKey);

-#endif

-	return 1;

-}

-*/

 

 LPSTR __cdecl _pgp_encrypt_key(LPCSTR szPlainMsg, LPCSTR pgpKey)

 {

@@ -314,31 +243,12 @@ LPSTR __cdecl _pgp_encrypt_key(LPCSTR szPlainMsg, LPCSTR pgpKey)
     DWORD dwEncMsgLen;

 

     PGPUInt32 dwKeys;

-#if (PGP_WIN32 < 0x700)

 	PGPKeySetRef PublicKey;

     if (CheckPGPError(_pgp_import_key(&PublicKey,pgpKey)))

        return 0;

 	PGPCountKeys(PublicKey, &dwKeys);

-#else

-	PGPKeyDBRef PublicKeyDB;

-    if (CheckPGPError(_pgp_import_key(&PublicKeyDB,pgpKey)))

-       return 0;

-

-    PGPKeyIterRef KeyIterRef;

-    PGPNewKeyIterFromKeyDB(PublicKeyDB, &KeyIterRef);

-

-	PGPKeyDBObjRef PublicKey;

-	PGPKeyIterNextKeyDBObj(KeyIterRef, kPGPKeyDBObjType_Key, &PublicKey);

-

-	PGPCountKeysInKeyDB(PublicKeyDB, &dwKeys);

-#endif

 	if(dwKeys==0) {

-#if (PGP_WIN32 < 0x700)

 		PGPFreeKeySet(PublicKey);

-#else

-	    PGPFreeKeyIter(KeyIterRef);

-		PGPFreeKeyDB(PublicKeyDB);

-#endif

 		return 0;

 	}

 

@@ -346,21 +256,11 @@ LPSTR __cdecl _pgp_encrypt_key(LPCSTR szPlainMsg, LPCSTR pgpKey)
       PGPOInputBuffer(pgpContext, szPlainMsg, lstrlen(szPlainMsg)),

       PGPOArmorOutput(pgpContext, TRUE),

       PGPOAllocatedOutputBuffer(pgpContext, (LPVOID *)&szEncMsg, 16384, (PGPUInt32 *)&dwEncMsgLen),

-#if (PGP_WIN32 < 0x700)

       PGPOEncryptToKeySet(pgpContext, PublicKey),

-#else

-      PGPOEncryptToKeyDBObj(pgpContext, PublicKey),

-#endif

       PGPOVersionString(pgpContext, szVersionStr),

       PGPOLastOption(pgpContext));

 

-#if (PGP_WIN32 < 0x700)

 	PGPFreeKeySet(PublicKey);

-#else

-    PGPFreeKeyIter(KeyIterRef);

-	PGPFreeKeyDB(PublicKeyDB);

-#endif

-

     if (CheckPGPError(err))

        return 0;

 

@@ -379,23 +279,12 @@ LPSTR __cdecl _pgp_decrypt_key(LPCSTR szEncMsg, LPCSTR pgpKey)
     DWORD dwPlainMsgLen;

 

     PGPUInt32 dwKeys;

-#if (PGP_WIN32 < 0x700)

 	PGPKeySetRef PrivateKeyDB;

     if (CheckPGPError(_pgp_import_key(&PrivateKeyDB,pgpKey)))

        return 0;

 	PGPCountKeys(PrivateKeyDB, &dwKeys);

-#else

-	PGPKeyDBRef PrivateKeyDB;

-    if (CheckPGPError(_pgp_import_key(&PrivateKeyDB,pgpKey)))

-       return 0;

-	PGPCountKeysInKeyDB(PrivateKeyDB, &dwKeys);

-#endif

 	if(dwKeys==0) {

-#if (PGP_WIN32 < 0x700)

 		PGPFreeKeySet(PrivateKeyDB);

-#else

-		PGPFreeKeyDB(PrivateKeyDB);

-#endif

 		return 0;

 	}

 

@@ -410,47 +299,10 @@ LPSTR __cdecl _pgp_decrypt_key(LPCSTR szEncMsg, LPCSTR pgpKey)
 			break;

     	}

 

-/*

-#if (PGP_WIN32 < 0x700)

-	    PGPKeyListRef PrivateKeyList;

-	    PGPOrderKeySet(PrivateKeyDB, kPGPKeyIDOrdering, &PrivateKeyList);

-

-	    PGPKeyIterRef KeyIterRef;

-	    PGPNewKeyIter(PrivateKeyList, &KeyIterRef);

-

-		PGPKeyRef PrivateKey;

-	    for(int i=0;i<dwKeys;i++) {

-			PGPKeyIterNext(KeyIterRef, &PrivateKey);

-			PGPOPassphraseIsValid(PrivateKey,

-							      PGPOPassphrase(pgpContext, pszPassphrase),

-							      PGPOLastOption(pgpContext));

-		}

-

-	    PGPFreeKeyList(PrivateKeyList);

-	    PGPFreeKeyIter(KeyIterRef);

-#else

-	    PGPKeyIterRef KeyIterRef;

-	    PGPNewKeyIterFromKeyDB(PrivateKeyDB, &KeyIterRef);

-

-		PGPKeyDBObjRef KeyDBObjRef;

-	    for(int i=0;i<dwKeys;i++) {

-			PGPKeyIterNextKeyDBObj(KeyIterRef, kPGPKeyDBObjType_Key, &KeyDBObjRef);

-			PGPOPassphraseIsValid(PrivateKey,

-							      PGPOPassphrase(pgpContext, pszPassphrase),

-							      PGPOLastOption(pgpContext));

-		}

-

-	    PGPFreeKeyIter(KeyIterRef);

-#endif

-*/

 		PGPError err = PGPDecode(pgpContext,

 	       PGPOInputBuffer(pgpContext, szEncMsg, lstrlen(szEncMsg)),

 	       PGPOAllocatedOutputBuffer(pgpContext, (LPVOID *)&szPlainMsg, 16384, (PGPUInt32 *)&dwPlainMsgLen),

-#if (PGP_WIN32 < 0x700)

 		   PGPOKeySetRef(pgpContext, PrivateKeyDB),

-#else

-	       PGPOKeyDBRef(pgpContext, PrivateKeyDB),

-#endif

 	       PGPOPassphrase(pgpContext, pszPassphrase),

 	       PGPOLastOption(pgpContext));

 

@@ -464,12 +316,8 @@ LPSTR __cdecl _pgp_decrypt_key(LPCSTR szEncMsg, LPCSTR pgpKey)
 		}

 

     } while(!dwPlainMsgLen && iTry<3);

-    

-#if (PGP_WIN32 < 0x700)

+

 	PGPFreeKeySet(PrivateKeyDB);

-#else

-	PGPFreeKeyDB(PrivateKeyDB);

-#endif

 

 	if(iTry == 3) return 0;

 

@@ -490,11 +338,7 @@ int __cdecl _pgp_size_keyid()
 

 PVOID __cdecl _pgp_select_keyid(HWND hDlg,LPSTR szKeyID)

 {

-#if (PGP_WIN32 < 0x700)

 	PGPKeySetRef ContactKeyDB;

-#else

-	PGPKeyDBRef ContactKeyDB;

-#endif

     PGPError err;

     err = PGPRecipientDialog(pgpContext, pgpKeyDB, TRUE, &ContactKeyDB,

           PGPOUIParentWindowHandle(pgpContext, hDlg),

@@ -504,11 +348,7 @@ PVOID __cdecl _pgp_select_keyid(HWND hDlg,LPSTR szKeyID)
        return 0;

 

     PGPUInt32 dwKeys;

-#if (PGP_WIN32 < 0x700)

 	PGPCountKeys(ContactKeyDB, &dwKeys);

-#else

-	PGPCountKeysInKeyDB(ContactKeyDB, &dwKeys);

-#endif

     if (!dwKeys) {

        return 0;

     } else if (dwKeys > 1)

@@ -516,7 +356,6 @@ PVOID __cdecl _pgp_select_keyid(HWND hDlg,LPSTR szKeyID)
 

 	static PGPKeyID KeyID;

 

-#if (PGP_WIN32 < 0x700)

     PGPKeyListRef ContactKeyList;

     PGPOrderKeySet(ContactKeyDB, kPGPKeyIDOrdering, &ContactKeyList);

 

@@ -532,53 +371,5 @@ PVOID __cdecl _pgp_select_keyid(HWND hDlg,LPSTR szKeyID)
     PGPFreeKeyList(ContactKeyList);

     PGPFreeKeyIter(KeyIterRef);

     PGPFreeKeySet(ContactKeyDB);

-#else

-    PGPKeyIterRef KeyIterRef;

-    PGPNewKeyIterFromKeyDB(ContactKeyDB, &KeyIterRef);

-

-    PGPKeyDBObjRef KeyDBObjRef;

-    PGPKeyIterNextKeyDBObj(KeyIterRef, kPGPKeyDBObjType_Key, &KeyDBObjRef);

-

-    PGPSize dwFilled;

-    PGPGetKeyDBObjDataProperty(KeyDBObjRef, kPGPKeyProperty_KeyID, &KeyID, sizeof(PGPKeyID), &dwFilled);

-	PGPGetKeyIDString(&KeyID, kPGPKeyIDString_Abbreviated, szKeyID);

-

-    PGPFreeKeyIter(KeyIterRef);

-    PGPFreeKeyDB(ContactKeyDB);

-#endif

-

     return (PVOID)&KeyID;

 }

-

-

-#if (PGP_WIN32 >= 0x700)

-BOOL ShowSelectKeyringsDlg(HWND hParent, LPSTR PubRingPath, LPSTR SecRingPath)

-{

-   // set keyring paths

-   OPENFILENAME ofn={0};

-   ofn.lStructSize = sizeof(ofn);

-   ofn.hwndOwner = hParent;

-   ofn.nMaxFile = MAX_PATH;

-   ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON;

-

-   ofn.lpstrFile = PubRingPath;

-   ofn.lpstrFilter = "Public key rings (pubring.pkr)\0pubring.pkr\0All files (*.*)\0*.*\0";

-   ofn.lpstrTitle = "Open Public Keyring";

-   if (!GetOpenFileName(&ofn)) return FALSE;

-

-   ofn.lpstrFile = SecRingPath;

-   ofn.lpstrFilter = "Secret key rings (secring.skr)\0secring.skr\0All files (*.*)\0*.*\0";

-   ofn.lpstrTitle = "Open Secret Keyring";

-   if (!GetOpenFileName(&ofn)) return FALSE;

-

-   return TRUE;

-}

-#endif

-

-

-// dllmain

-BOOL WINAPI dllmain(HINSTANCE hInst, DWORD dwReason, LPVOID) {

-	g_hInst = hInst;

-	return TRUE;

-}

-