refactor: CertificateBox: Use cryptography module for certificate details

2 files changed, 14 insertions, 9 deletions

diff --git a/test/gtk/certificate_dialog.py b/test/gtk/certificate_dialog.py
index 534fe5500..48faa7cd7 100644
--- a/test/gtk/certificate_dialog.py
+++ b/test/gtk/certificate_dialog.py
@@ -1,15 +1,15 @@
 import gi
+gi.require_version('Gio', '2.0')
 gi.require_version('Gtk', '3.0')
+from gi.repository import Gio
 from gi.repository import Gtk
 
-import OpenSSL
-
 from gajim import gui
 gui.init('gtk')
 
 from test.gtk import util
 from gajim.common.const import CSSPriority
-from gajim.gui.dialogs import CertificateDialog
+from gajim.gui.certificate_dialog import CertificateDialog
 
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
@@ -47,8 +47,8 @@ ejsJoYkpvcaiaLAyVymTY/n/oM2oQpv5Mqjit+18RB9c2P+ifH5iDKC/jTKn4NNz
 8xSTlUlCBTCozjzscZVeVDIojmejWclT
 -----END CERTIFICATE-----'''
 
-cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
-win = CertificateDialog(None, 'testacc', cert)
-win.connect("destroy", Gtk.main_quit)
+gio_cert = Gio.TlsCertificate.new_from_pem(cert, -1)
+win = CertificateDialog(None, 'testacc', gio_cert)
+win.connect('destroy', Gtk.main_quit)
 win.show_all()
 Gtk.main()
diff --git a/test/gtk/util.py b/test/gtk/util.py
index 9ecd50ece..06a949c5e 100644
--- a/test/gtk/util.py
+++ b/test/gtk/util.py
@@ -3,12 +3,15 @@ from pathlib import Path
 from gi.repository import Gdk
 from gi.repository import Gtk
 
+from gajim.common.const import CSSPriority
 
-def get_gajim_dir():
+
+def get_gajim_dir() -> Path:
     gajim_path = Path(__file__) / '..' / '..' / '..' / 'gajim'
     return gajim_path.resolve()
 
-def load_style(filename, priority):
+
+def load_style(filename: str, priority: CSSPriority) -> None:
     path = get_gajim_dir() / 'data' / 'style' / filename
     try:
         with open(str(path), 'r', encoding='utf8') as file:
@@ -18,6 +21,8 @@ def load_style(filename, priority):
         return
     provider = Gtk.CssProvider()
     provider.load_from_data(bytes(css.encode('utf-8')))
-    Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
+    screen = Gdk.Screen.get_default()
+    assert screen is not None
+    Gtk.StyleContext.add_provider_for_screen(screen,
                                              provider,
                                              priority)