gajim: Defer the creation of XTLS until it's first time used.

[Gajim]

changeset 24d7a00c68db in /home/hg/repos/gajim

author: Fedor Brunner <fedor.brun...@azet.sk>
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=24d7a00c68db
description: Defer the creation of XTLS until it's first time used.
        This will make Gajim start a bit faster and more entropy can be
        generated for key generation.

diffstat:

 src/common/check_paths.py |  7 -------
 src/common/jingle_ft.py   |  9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r 198e8a642c7e -r 24d7a00c68db src/common/check_paths.py
--- a/src/common/check_paths.py Tue Apr 15 12:42:09 2014 +0200
+++ b/src/common/check_paths.py Tue Apr 15 14:01:55 2014 +0200
@@ -30,7 +30,6 @@
 
 from common import gajim
 from common import logger
-from common import jingle_xtls
 
 # DO NOT MOVE ABOVE OF import gajim
 import sqlite3 as sqlite
@@ -350,12 +349,6 @@
         create_path(XTLS_CERTS)
     if not os.path.exists(LOCAL_XTLS_CERTS):
         create_path(LOCAL_XTLS_CERTS)
-    cert_name = os.path.join(LOCAL_XTLS_CERTS,
-        jingle_xtls.SELF_SIGNED_CERTIFICATE)
-    if gajim.HAVE_PYOPENSSL and not (os.path.exists(cert_name + '.cert') and \
-    os.path.exists(cert_name + '.pkey')):
-        jingle_xtls.make_certs(cert_name, 'gajim')
-
 
 def create_path(directory):
     head, tail = os.path.split(directory)
diff -r 198e8a642c7e -r 24d7a00c68db src/common/jingle_ft.py
--- a/src/common/jingle_ft.py   Tue Apr 15 12:42:09 2014 +0200
+++ b/src/common/jingle_ft.py   Tue Apr 15 14:01:55 2014 +0200
@@ -19,9 +19,11 @@
 Handles  Jingle File Transfer (XEP 0234)
 """
 
+import os
 import hashlib
 from common import gajim
 import nbxmpp
+from common import configpaths
 from . import jingle_xtls
 from common.jingle_content import contents, JingleContent
 from common.jingle_transport import *
@@ -108,6 +110,13 @@
                    STATE_TRANSPORT_REPLACE : StateTransportReplace(self),
               STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self)
         }
+        
+        if jingle_xtls.PYOPENSSL_PRESENT:
+            cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'],
+                                     jingle_xtls.SELF_SIGNED_CERTIFICATE)
+            if not (os.path.exists(cert_name + '.cert')
+                    and os.path.exists(cert_name + '.pkey')):
+                jingle_xtls.make_certs(cert_name, 'gajim')
 
     def __state_changed(self, nextstate, args=None):
         # Executes the next state action and sets the next state
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits