copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correct for API changes in pyOpenSSL 

Fixes #7662
This commit is contained in:
Fedor Brunner 2014-02-18 10:09:03 +01:00
parent 667cd1eb48
commit 7b85094b88
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gajim.py
View File

@ -320,7 +320,10 @@ try:
from common import crypto from common import crypto
PYOPENSSL_PRNG_PRESENT = True PYOPENSSL_PRNG_PRESENT = True
# Seed from file # 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() crypto.add_entropy_sources_OpenSSL()
except ImportError: except ImportError:
log.info("PyOpenSSL PRNG not available") log.info("PyOpenSSL PRNG not available")
@ -473,7 +476,10 @@ del pid_dir
def on_exit(): def on_exit():
# Save the entropy from OpenSSL PRNG # Save the entropy from OpenSSL PRNG
if PYOPENSSL_PRNG_PRESENT: 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 # delete pid file on normal exit
if os.path.exists(pid_filename): if os.path.exists(pid_filename):
os.remove(pid_filename) os.remove(pid_filename)