Commits

commits@gajim.org

17632 discussions

gajim: Fix typo. Fixes #7598
by Gajim 18 Dec '13

18 Dec '13

changeset 37e19d43dbee in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=37e19d43dbee description: Fix typo. Fixes #7598 diffstat: src/gui_menu_builder.py | 4 ++-- 1 файлов изменено, 2 вставок(+), 2 удалений(-) различия (21 строк): diff -r 052948aee9c9 -r 37e19d43dbee src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Dec 16 13:20:06 2013 +0100 +++ b/src/gui_menu_builder.py Wed Dec 18 20:08:45 2013 +0400 @@ -181,7 +181,7 @@ gajim.gc_connected[account][r_jid]: rooms2.append((r_jid, account)) r_jids.append(r_jid) - + if not rooms2: return item = gtk.SeparatorMenuItem() # separator @@ -444,7 +444,7 @@ bookmarked = False c_ = gajim.contacts.get_contact(account, gc_contact.jid, gc_contact.resource) - if c_ and c_.supports(nbxmpp.NS_CONFERENCE): + if c_ and c_.supports(NS_CONFERENCE): bookmarked=True build_invite_submenu(invite_menuitem, [(gc_contact, account)], show_bookmarked=bookmarked)

1 0

gajim-website: fix typo
by Gajim Website 16 Dec '13

16 Dec '13

changeset 1577df49957a in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=1577df49957a description: fix typo diffstat: index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7db0ed55c216 -r 1577df49957a index.php --- a/index.php Mon Dec 16 16:04:39 2013 +0100 +++ b/index.php Mon Dec 16 16:06:52 2013 +0100 @@ -70,7 +70,7 @@ ); $array_news_desc = array( - 0 => sprintf(_("Version %s will arrive soon."), "0.16")); + 0 => sprintf(_("Version %s will arrive soon."), "0.16"), 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"),

1 0

gajim-website: announce beta2 release
by Gajim Website 16 Dec '13

16 Dec '13

changeset 7db0ed55c216 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=7db0ed55c216 description: announce beta2 release diffstat: downloads.php | 14 ++++++------ index.php | 62 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 32 deletions(-) diffs (159 lines): diff -r b20fbcb989ab -r 7db0ed55c216 downloads.php --- a/downloads.php Tue Sep 03 20:44:16 2013 +0200 +++ b/downloads.php Mon Dec 16 16:04:39 2013 +0100 @@ -8,7 +8,7 @@ $last_version = "0.15.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; -printf(_(" A %s version is in test"), "0.16-beta1"); +printf(_(" A %s version is in test"), "0.16-beta2"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -20,8 +20,8 @@ print ("</a>\n"); print _(" If you use Debian unstable do")." apt-get install gajim\n"; print (" \n"); -printf(_(" The Debian package of %s is "), "0.16-beta1"); -print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~beta1-…">"._("here")."</a>. \n"; +printf(_(" The Debian package of %s is "), "0.16-beta2"); +print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~beta2-…">"._("here")."</a>. \n"; print _(" A daily package from mercurial is also built. To use it, remove gajim")." (apt-get remove gajim), "._("add this line to your")." /etc/apt/sources.list:\n"; print (" \n"); print (" deb ftp://ftp.gajim.org/debian unstable main\n"); @@ -147,8 +147,8 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-beta1-1.exe\">"._("Gajim installer")."</a> "; -printf(_("for %s version "), "0.16-beta1"); +print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-beta2-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.16-beta2"); print (".\n"); print (" \n"); @@ -159,8 +159,8 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">"._("see the <tt>README</tt>")."</a> ("._("in English")."). \n"; -printf(_(" The tarball version of %s is "), "0.16-beta1"); -print "<a href=\"downloads/0.16/gajim-0.16-beta1.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.16-beta2"); +print "<a href=\"downloads/0.16/gajim-0.16-beta2.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); diff -r b20fbcb989ab -r 7db0ed55c216 index.php --- a/index.php Tue Sep 03 20:44:16 2013 +0200 +++ b/index.php Mon Dec 16 16:04:39 2013 +0100 @@ -50,52 +50,64 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15.4"), - 1 => sprintf(_("Gajim %s is here!"), "0.15.3"), - 2 => sprintf(_("Gajim %s is here!"), "0.15.2"), - 3 => sprintf(_("Gajim %s is here!"), "0.15.1"), - 4 => sprintf(_("Gajim %s is here!"), "0.15"), + 0 => sprintf(_("Beta-release of Gajim %s"), "0.16"), + 1 => sprintf(_("Gajim %s is here!"), "0.15.4"), + 2 => sprintf(_("Gajim %s is here!"), "0.15.3"), + 3 => sprintf(_("Gajim %s is here!"), "0.15.2"), + 4 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 5 => sprintf(_("Gajim %s is here!"), "0.15"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), -// 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("25 May 2013"), - 1 => _("17 March 2013"), - 2 => _("30 October 2012"), - 3 => _("29 August 2012"), - 4 => _("18 March 2012"), + 0 => _("16 December 2013"), + 1 => _("25 May 2013"), + 2 => _("17 March 2013"), + 3 => _("30 October 2012"), + 4 => _("29 August 2012"), + 5 => _("18 March 2012"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.15"), + 0 => sprintf(_("Version %s will arrive soon."), "0.16")); + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), + 4 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.15"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.15.3"), - 1 => sprintf(_("What's new since %s:"), "0.15.2"), - 2 => sprintf(_("What's new since %s:"), "0.15.1"), - 3 => sprintf(_("What's new since %s:"), "0.15"), - 4 => sprintf(_("What's new since %s:"), "0.14.4"), + 0 => sprintf(_("What's new since %s:"), "0.15.4"), + 1 => sprintf(_("What's new since %s:"), "0.15.3"), + 2 => sprintf(_("What's new since %s:"), "0.15.2"), + 3 => sprintf(_("What's new since %s:"), "0.15.1"), + 4 => sprintf(_("What's new since %s:"), "0.15"), + 5 => sprintf(_("What's new since %s:"), "0.14.4"), ); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Improve File transfer"), + 1 => _("Improve security"), + 2 => _("Improve audio / video calls"), + 3 => _("Last message correction"), + 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16-beta2/ChangeLog\">"._("Full ChangeLog")."</a> ", + 5 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Fix connection to non-SSL servers"), 1 => _("Minor other fixes"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.4/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.4\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Better handling of SSL errors"), 1 => _("Better handling of canceling file transfer"), 2 => _("Improve farstream calls"), @@ -103,20 +115,20 @@ 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix crash when pressing ESC in chat window"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.2/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Switch to python-farstream"), 1 => _("Fix several issues"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"),

1 0

python-nbxmpp: fix typo
by Yann Leboulanger 16 Dec '13

16 Dec '13

changeset a9d1433fc39d in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a9d1433fc39d description: fix typo diffstat: nbxmpp/auth_nb.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (24 lines): diff -r c839fa560360 -r a9d1433fc39d nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Mon Dec 16 11:19:00 2013 +0100 +++ b/nbxmpp/auth_nb.py Mon Dec 16 15:55:53 2013 +0100 @@ -25,11 +25,8 @@ from protocol import NS_STREAM_MGMT from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from plugin import PlugIn -from smacks import Smacks import base64 -import itertools import dispatcher_nb -import hashlib import hmac import hashlib @@ -434,7 +431,7 @@ else: self.resp['realm'] = self._owner.Server self.resp['nonce'] = chal['nonce'] - self.resp['cnonce'] = '%x' % rngd.getrandbits(196) + self.resp['cnonce'] = '%x' % rndg.getrandbits(196) self.resp['nc'] = ('00000001') self.resp['qop'] = 'auth' self.resp['digest-uri'] = 'xmpp/' + self._owner.Server

1 0

gajim: Added tag gajim-0.16-beta2 for changeset 9931beb5eec2
by Gajim 16 Dec '13

16 Dec '13

changeset 052948aee9c9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=052948aee9c9 description: Added tag gajim-0.16-beta2 for changeset 9931beb5eec2 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 9931beb5eec2 -r 052948aee9c9 .hgtags --- a/.hgtags Mon Dec 16 13:18:39 2013 +0100 +++ b/.hgtags Mon Dec 16 13:20:06 2013 +0100 @@ -9,3 +9,4 @@ 7538b7eff0cd2adf455beb78c206c5ffb81ba2f0 gajim-0.16-alpha1 e2731a8cd582d3541bc8383e12a4775c8f229d65 gajim-0.16-alpha2 a0b59d4aadced51b902783d75d64461aa41bf7a3 gajim-0.16-beta1 +9931beb5eec2c6fce4d7c9d1094375d05ac321de gajim-0.16-beta2

1 0

gajim: include needed files for snarl plugin in windows installer.
by Gajim 16 Dec '13

16 Dec '13

changeset 9931beb5eec2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9931beb5eec2 description: include needed files for snarl plugin in windows installer. diffstat: build.bat | 3 +++ gajim.nsi | 8 ++++++++ setup_win32.py | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diffs (77 lines): diff -r 5c30bb1e1161 -r 9931beb5eec2 build.bat --- a/build.bat Mon Dec 16 11:16:27 2013 +0100 +++ b/build.bat Mon Dec 16 13:18:39 2013 +0100 @@ -22,6 +22,9 @@ copy ..\LIBEAY32.dll bin copy ..\SSLEAY32.dll bin +REM for snarl plugin +xcopy ..\win32com bin\win32com /e /i + mkdir bin\gtk cd ../src/gtk hg archive ..\..\gajim_built\bin\gtk diff -r 5c30bb1e1161 -r 9931beb5eec2 gajim.nsi --- a/gajim.nsi Mon Dec 16 11:16:27 2013 +0100 +++ b/gajim.nsi Mon Dec 16 13:18:39 2013 +0100 @@ -182,8 +182,10 @@ File "bin\library.zip" File "bin\pangocairo.pyd" File "bin\pango.pyd" + File "bin\pycurl.pyd" File "bin\pyexpat.pyd" File "bin\python27.dll" + File "bin\pythoncom27.dll" File "bin\pywintypes27.dll" File "bin\OpenSSL.rand.pyd" File "bin\select.pyd" @@ -194,8 +196,10 @@ File "bin\win32api.pyd" File "bin\win32file.pyd" File "bin\win32pipe.pyd" + File "bin\win32ui.pyd" File "bin\winsound.pyd" File "msvcr90.dll" + File /r "bin\win32com" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" @@ -530,6 +534,7 @@ RMDir /r "$INSTDIR\bin\gtk\lib" RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" + RMDir "$INSTDIR\bin\win32com" Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" @@ -558,8 +563,10 @@ Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" Delete "$INSTDIR\bin\pango.pyd" Delete "$INSTDIR\bin\pangocairo.pyd" + Delete "$INSTDIR\bin\pycurl.pyd" Delete "$INSTDIR\bin\pyexpat.pyd" Delete "$INSTDIR\bin\python27.dll" + Delete "$INSTDIR\bin\pythoncom27.dll" Delete "$INSTDIR\bin\pywintypes27.dll" Delete "$INSTDIR\bin\select.pyd" Delete "$INSTDIR\bin\sqlite3.dll" @@ -568,6 +575,7 @@ Delete "$INSTDIR\bin\win32api.pyd" Delete "$INSTDIR\bin\win32file.pyd" Delete "$INSTDIR\bin\win32pipe.pyd" + Delete "$INSTDIR\bin\win32ui.pyd" Delete "$INSTDIR\bin\winsound.pyd" Delete "$INSTDIR\bin\msvcr90.dll" RMDir /r "$INSTDIR\bin" diff -r 5c30bb1e1161 -r 9931beb5eec2 setup_win32.py --- a/setup_win32.py Mon Dec 16 11:16:27 2013 +0100 +++ b/setup_win32.py Mon Dec 16 13:18:39 2013 +0100 @@ -33,7 +33,7 @@ 'build_exe': { 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers'], + 'numbers', 'win32com.client', 'win32com.server'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

python-nbxmpp: [Fedor] Fix unit test (new parameter cipher_list)
by Yann Leboulanger 16 Dec '13

16 Dec '13

changeset c839fa560360 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=c839fa560360 description: [Fedor] Fix unit test (new parameter cipher_list) diffstat: test/unit/test_xmpp_transports_nb2.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r bcfdd6de09ae -r c839fa560360 test/unit/test_xmpp_transports_nb2.py --- a/test/unit/test_xmpp_transports_nb2.py Sat Dec 14 10:04:51 2013 +0100 +++ b/test/unit/test_xmpp_transports_nb2.py Mon Dec 16 11:19:00 2013 +0100 @@ -82,6 +82,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=('../data/other/cacerts.pem', 'tmp/cacerts.pem'), + cipher_list=None, proxy_dict=proxy_dict) self.socket.PlugIn(self) @@ -215,6 +216,7 @@ idlequeue=self.idlequeue_thread.iq, estabilish_tls=False, certs=None, + cipher_list=None, on_http_request_possible=lambda: None, on_persistent_fallback=None, http_dict=http_dict,

1 0

gajim: prepare beta2 release
by Gajim 16 Dec '13

16 Dec '13

changeset 5c30bb1e1161 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5c30bb1e1161 description: prepare beta2 release diffstat: ChangeLog | 2 ++ autogen.sh | 2 +- debian/changelog | 6 ++++++ src/common/defs.py | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diffs (52 lines): diff -r 348b6df15bbd -r 5c30bb1e1161 ChangeLog --- a/ChangeLog Sat Dec 14 09:57:50 2013 +0100 +++ b/ChangeLog Mon Dec 16 11:16:27 2013 +0100 @@ -2,11 +2,13 @@ * Improve File transfer support by adding Jingle file transfer * use external python-nbxmpp library + * improve security * Improve audio / Video calls and add screensharing feature * Support systemd-logind * Support XEP-0308 Last message correction * Support XEP-0224 Attention * Support XEP-0191 Blocking command + * Support XEP-0249 Direct Invitation * Better RTL languages support Gajim 0.15.4 (25 May 2013) diff -r 348b6df15bbd -r 5c30bb1e1161 autogen.sh --- a/autogen.sh Sat Dec 14 09:57:50 2013 +0100 +++ b/autogen.sh Mon Dec 16 11:16:27 2013 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16-beta1" + gajimversion="0.16-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 348b6df15bbd -r 5c30bb1e1161 debian/changelog --- a/debian/changelog Sat Dec 14 09:57:50 2013 +0100 +++ b/debian/changelog Mon Dec 16 11:16:27 2013 +0100 @@ -1,3 +1,9 @@ +gajim (0.16~beta2-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Mon, 16 Dec 2013 11:14:07 +0200 + gajim (0.16~beta1-1) unstable; urgency=low * New upstream release diff -r 348b6df15bbd -r 5c30bb1e1161 src/common/defs.py --- a/src/common/defs.py Sat Dec 14 09:57:50 2013 +0100 +++ b/src/common/defs.py Mon Dec 16 11:16:27 2013 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16-beta1' +version = '0.16-beta2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

python-nbxmpp: [Fedor Brunner] Use better random number generato...
by Yann Leboulanger 14 Dec '13

14 Dec '13

changeset bcfdd6de09ae in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=bcfdd6de09ae description: [Fedor Brunner] Use better random number generator when openssl is available. Fixes #12 diffstat: nbxmpp/auth_nb.py | 9 ++++----- nbxmpp/bosh.py | 8 ++++---- nbxmpp/rndg.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 9 deletions(-) diffs (125 lines): diff -r 2d6e5d6949e8 -r bcfdd6de09ae nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Fri Dec 06 21:19:37 2013 +0100 +++ b/nbxmpp/auth_nb.py Sat Dec 14 10:04:51 2013 +0100 @@ -27,7 +27,6 @@ from plugin import PlugIn from smacks import Smacks import base64 -import random import itertools import dispatcher_nb import hashlib @@ -37,6 +36,8 @@ import logging log = logging.getLogger('nbxmpp.auth_nb') +import rndg + def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() def C(some): return ':'.join(some) @@ -433,8 +434,7 @@ else: self.resp['realm'] = self._owner.Server self.resp['nonce'] = chal['nonce'] - self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint \ - in itertools.repeat(random.randint, 7)) + self.resp['cnonce'] = '%x' % rngd.getrandbits(196) self.resp['nc'] = ('00000001') self.resp['qop'] = 'auth' self.resp['digest-uri'] = 'xmpp/' + self._owner.Server @@ -464,8 +464,7 @@ def set_password(self, password): self.password = '' if password is None else password if self.mechanism == 'SCRAM-SHA-1': - nonce = ''.join('%x' % randint(0, 2 ** 28) for randint in \ - itertools.repeat(random.randint, 7)) + nonce = '%x' % rndg.getrandbits(196) self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ diff -r 2d6e5d6949e8 -r bcfdd6de09ae nbxmpp/bosh.py --- a/nbxmpp/bosh.py Fri Dec 06 21:19:37 2013 +0100 +++ b/nbxmpp/bosh.py Sat Dec 14 10:04:51 2013 +0100 @@ -18,7 +18,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import locale, random +import locale from hashlib import sha1 from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ @@ -29,6 +29,8 @@ import logging log = logging.getLogger('nbxmpp.bosh') +import rndg + KEY_COUNT = 10 # Fake file descriptor - it's used for setting read_timeout in idlequeue for @@ -486,9 +488,7 @@ # to 7881299347898368 messages to raise rid over 2**53 # (see http://www.xmpp.org/extensions/xep-0124.html#rids) # it's also used for sequence key initialization - r = random.Random() - r.seed() - return r.getrandbits(50) + return rndg.getrandbits(50) diff -r 2d6e5d6949e8 -r bcfdd6de09ae nbxmpp/rndg.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nbxmpp/rndg.py Sat Dec 14 10:04:51 2013 +0100 @@ -0,0 +1,49 @@ +## rndg.py +## +## cryptographically secure pseudo-random number generator. +## When possible use OpenSSL PRNG combined with os.random, +## if OpenSSL PRNG is not available, use only os.random. +## +## Copyright (C) 2013 Fedor Brunner <fedor.brunner(a)azet.sk> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +USE_PYOPENSSL = False +try: + import OpenSSL.rand + import binascii, os + USE_PYOPENSSL = True +except ImportError: + import random + +if not USE_PYOPENSSL: + getrandbits = random.SystemRandom().getrandbits +else: + def getrandbits(k): + """getrandbits(k) -> x. Generates a long int with k random bits.""" + if k <= 0: + raise ValueError('number of bits must be greater than zero') + if k != int(k): + raise TypeError('number of bits should be an integer') + + bytes = (k + 7) // 8 # bits / 8 and rounded up + + # Add system entropy to OpenSSL PRNG + OpenSSL.rand.add(os.urandom(bytes), bytes) + # Extract random bytes from OpenSSL PRNG + random_str = OpenSSL.rand.bytes(bytes) + + x = long(binascii.hexlify(random_str), 16) + return x >> (bytes * 8 - k) # trim excess bits

1 0

gajim: add missing signal. Fixes #7586
by Gajim 14 Dec '13

14 Dec '13

changeset 348b6df15bbd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=348b6df15bbd description: add missing signal. Fixes #7586 diffstat: data/gui/accounts_window.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4468727118ea -r 348b6df15bbd data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Fri Dec 06 21:20:22 2013 +0100 +++ b/data/gui/accounts_window.ui Sat Dec 14 09:57:50 2013 +0100 @@ -432,6 +432,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> + <signal name="focus_out_event" handler="on_cert_entry1_focus_out_event"/> </object> <packing> <property name="position">1</property>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits