changeset 49aa84ae4f2d in /home/hg/repos/gajim

author: Fedor Brunner fedor.brunner@azet.sk branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=49aa84ae4f2d description: correct for API changes in pyOpenSSL

Fixes #7662

diffstat:

src/gajim.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 0edfd3fd28f0 -r 49aa84ae4f2d src/gajim.py --- a/src/gajim.py Tue Feb 18 09:39:48 2014 +0100 +++ b/src/gajim.py Tue Feb 18 10:09:03 2014 +0100 @@ -320,7 +320,10 @@ from common import crypto PYOPENSSL_PRNG_PRESENT = True # Seed from file - OpenSSL.rand.load_file(str(RNG_SEED).encode('utf-8')) + try: + OpenSSL.rand.load_file(RNG_SEED) + except TypeError: + OpenSSL.rand.load_file(RNG_SEED.encode('utf-8')) crypto.add_entropy_sources_OpenSSL() except ImportError: log.info("PyOpenSSL PRNG not available") @@ -473,7 +476,10 @@ def on_exit(): # Save the entropy from OpenSSL PRNG if PYOPENSSL_PRNG_PRESENT: - OpenSSL.rand.write_file(str(RNG_SEED).encode('utf-8')) + try: + OpenSSL.rand.write_file(RNG_SEED) + except TypeError: + OpenSSL.rand.write_file(RNG_SEED.encode('utf-8')) # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename)