diff options
Diffstat (limited to 'protocols/JabberG/src')
| -rwxr-xr-x[-rw-r--r--] | protocols/JabberG/src/jabber.cpp | 3 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_omemo.cpp | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 3c4cb10a81..469e89c4cd 100644..100755 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -179,6 +179,8 @@ static int jabberProtoUninit(CJabberProto *ppro) return 0;
}
+int init_omemo();
+
extern "C" int __declspec(dllexport) Load()
{
// set the memory, lists & utf8 managers
@@ -221,6 +223,7 @@ extern "C" int __declspec(dllexport) Load() g_MenuInit();
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
JabberUserInfoInit();
+ init_omemo();
return 0;
}
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp index 0bd6c7e42a..825ed9428e 100755 --- a/protocols/JabberG/src/jabber_omemo.cpp +++ b/protocols/JabberG/src/jabber_omemo.cpp @@ -24,27 +24,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "stdafx.h"
-#include <axolotl.h>
+#include <signal_protocol.h>
//TODO: create mutex
-void lock(void */*user_data*/)
+void lock(void * /*user_data*/)
{
}
-void unlock(void */*user_data*/)
+void unlock(void * /*user_data*/)
{
}
-int init_axolotl()
+int init_omemo()
{
- axolotl_context *global_context;
- axolotl_crypto_provider provider;
- axolotl_context_create(&global_context, NULL);
- axolotl_context_set_crypto_provider(global_context, &provider);
- axolotl_context_set_locking_functions(global_context, &lock, &unlock);
+ signal_context *global_context;
+ signal_crypto_provider provider;
+ signal_context_create(&global_context, NULL);
+ signal_context_set_crypto_provider(global_context, &provider);
+ signal_context_set_locking_functions(global_context, &lock, &unlock);
return 0;
}
\ No newline at end of file |