Move crypto-vala inside libdino

6 files changed, 7 insertions, 10 deletions

diff --git a/plugins/ice/meson.build b/plugins/ice/meson.build
index 5ed807bf..5161b123 100644
--- a/plugins/ice/meson.build
+++ b/plugins/ice/meson.build
@@ -1,5 +1,4 @@
 dependencies = [
-    dep_crypto_vala,
     dep_dino,
     dep_gee,
     dep_gio,
@@ -23,12 +22,12 @@ c_args = vala_c_args + [
 vala_args = [
     '--vapidir', meson.current_source_dir() / 'vapi',
 ]
-if crypto_backend == 'gnutls'
+if crypto_backend == 'gnu'
     dependencies += [ dep_gnutls ]
     sources += files(
         'src/dtls_srtp_gnutls.vala'
     )
-else # openssl
+elif crypto_backend == 'openssl'
     dependencies += [ dep_openssl ]
     sources += files(
         'src/dtls_srtp_openssl.vala',
diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build
index d195525e..978fb9a6 100644
--- a/plugins/omemo/meson.build
+++ b/plugins/omemo/meson.build
@@ -1,7 +1,6 @@
 subdir('po')
 dependencies = [
     dep_libadwaita,
-    dep_crypto_vala,
     dep_dino,
     dep_gee,
     dep_glib,
@@ -61,10 +60,10 @@ c_args = vala_c_args + [
     '-DGETTEXT_PACKAGE="dino-omemo"',
     '-DLOCALE_INSTALL_DIR="@0@"'.format(get_option('prefix') / get_option('localedir')),
 ]
-if crypto_backend == 'gnutls'
+if crypto_backend == 'gnu'
     dependencies += [ dep_libgcrypt ]
     sources += files('src/native/helper_gcrypt.c')
-else
+elif crypto_backend == 'openssl'
     dependencies += [ dep_openssl ]
     sources += files('src/native/helper_openssl.c')
 endif
diff --git a/plugins/omemo/src/file_transfer/file_decryptor.vala b/plugins/omemo/src/file_transfer/file_decryptor.vala
index ff96b4a3..8ae0b96b 100644
--- a/plugins/omemo/src/file_transfer/file_decryptor.vala
+++ b/plugins/omemo/src/file_transfer/file_decryptor.vala
@@ -1,6 +1,6 @@
 using Dino.Entities;
 
-using Crypto;
+using Dino.Crypto;
 using Omemo;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/file_transfer/file_encryptor.vala b/plugins/omemo/src/file_transfer/file_encryptor.vala
index 1aed752f..5f1d6e69 100644
--- a/plugins/omemo/src/file_transfer/file_encryptor.vala
+++ b/plugins/omemo/src/file_transfer/file_encryptor.vala
@@ -1,7 +1,7 @@
 using Gee;
 using Gtk;
 
-using Crypto;
+using Dino.Crypto;
 using Dino.Entities;
 using Xmpp;
 using Omemo;
diff --git a/plugins/omemo/src/jingle/jet_omemo.vala b/plugins/omemo/src/jingle/jet_omemo.vala
index b1a27e15..8a84d3d2 100644
--- a/plugins/omemo/src/jingle/jet_omemo.vala
+++ b/plugins/omemo/src/jingle/jet_omemo.vala
@@ -1,4 +1,4 @@
-using Crypto;
+using Dino.Crypto;
 using Dino;
 using Dino.Entities;
 using Gee;
diff --git a/plugins/rtp/meson.build b/plugins/rtp/meson.build
index fadce062..b4ba5cf6 100644
--- a/plugins/rtp/meson.build
+++ b/plugins/rtp/meson.build
@@ -1,5 +1,4 @@
 dependencies = [
-    dep_crypto_vala,
     dep_dino,
     dep_gee,
     dep_glib,