2 files changed, 7 insertions, 19 deletions
diff --git a/include/m_crypto.h b/include/m_crypto.h
index 53a599c925..9d80ee3286 100644
--- a/include/m_crypto.h
+++ b/include/m_crypto.h
@@ -77,32 +77,16 @@ struct CRYPTO_PROVIDER
 	pfnCryptoProviderFactory pFactory;
 };
 
-#define MS_CRYPTO_REGISTER_ENGINE "Crypto/RegisterEngine"
+MIR_APP_DLL(void) Crypto_RegisterEngine(const CRYPTO_PROVIDER *pProvider);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // retrieves list of all available crypto providers
-// wParam = (WPARAM)(int*)piNumProviders
-// lParam = (CRYPTO_PROVIDER***)pointer to an array of CRYPTO_PROVIDER*
-// always returns 0
 
-#define MS_CRYPTO_ENUM_PROVIDERS "Crypto/EnumProviders"
-
-__forceinline void Crypto_EnumProviders(int *numProvs, CRYPTO_PROVIDER ***pResult)
-{
-	CallService(MS_CRYPTO_ENUM_PROVIDERS, WPARAM(numProvs), LPARAM(pResult));
-}
+MIR_APP_DLL(void) Crypto_ListProviders(int *pCount, CRYPTO_PROVIDER ***pList);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // retrieves a crypto provider by name
-// wParam = 0 (unused)
-// lParam = (const char*)pszProviderName = CRYPTO_PROVIDER::pszName
-// returns 0 on fail or CRYPTO_PROVIDER* on success
 
-#define MS_CRYPTO_GET_PROVIDER "Crypto/GetProvider"
-
-__forceinline CRYPTO_PROVIDER* Crypto_GetProvider(const char *pszName)
-{
-	return (CRYPTO_PROVIDER*)CallService(MS_CRYPTO_GET_PROVIDER, 0, LPARAM(pszName));
-}
+MIR_APP_DLL(CRYPTO_PROVIDER*) Crypto_GetProvider(const char *pszName);
 
 #endif // M_CRYPTO_H__
diff --git a/include/m_db_int.h b/include/m_db_int.h
index 600d478c14..45440ff981 100644
--- a/include/m_db_int.h
+++ b/include/m_db_int.h
@@ -168,6 +168,7 @@ interface MIR_APP_EXPORT MIDatabase
 #pragma warning(disable:4275)
 
 struct MICryptoEngine;
+struct CRYPTO_PROVIDER;
 
 class MIR_APP_EXPORT MDatabaseCommon : public MIDatabase, public MNonCopyable
 {
@@ -188,6 +189,9 @@ protected:
 	int  CheckProto(DBCachedContact *cc, const char *proto);
 	void UnlockName();
 
+	CRYPTO_PROVIDER* SelectProvider();
+	STDMETHOD_(BOOL, StoreProvider)(CRYPTO_PROVIDER*);
+
 	STDMETHOD_(BOOL, GetContactSettingWorker)(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv, int isStatic);
 	STDMETHOD_(BOOL, WriteContactSettingWorker)(MCONTACT contactID, DBCONTACTWRITESETTING &dbcws) PURE;