summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm Kruis <a.kruis@science-computing.de>2015-03-03 13:02:02 +0100
committerAnselm Kruis <a.kruis@science-computing.de>2015-03-03 13:02:02 +0100
commitc158db9833c70b2f57db0a58ab6133595c740d6f (patch)
tree7d06ceb1f479261f157922b5ace1ea35a1ede7f4
parentceddde7498a1b88e9662668b037552b71010cf46 (diff)
downloadparamiko-c158db9833c70b2f57db0a58ab6133595c740d6f.tar.gz
Switch kex_gss from using PyCrypto's Random to using os.urandom.
-rw-r--r--paramiko/kex_gss.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/kex_gss.py b/paramiko/kex_gss.py
index d026807c..69969f8a 100644
--- a/paramiko/kex_gss.py
+++ b/paramiko/kex_gss.py
@@ -37,6 +37,7 @@ This module provides GSS-API / SSPI Key Exchange as defined in :rfc:`4462`.
.. versionadded:: 1.15
"""
+import os
from hashlib import sha1
from paramiko.common import *
@@ -130,7 +131,7 @@ class KexGSSGroup1(object):
larger than q (but this is a tiny tiny subset of potential x).
"""
while 1:
- x_bytes = self.transport.rng.read(128)
+ x_bytes = os.urandom(128)
x_bytes = byte_mask(x_bytes[0], 0x7f) + x_bytes[1:]
if (x_bytes[:8] != self.b7fffffffffffffff) and \
(x_bytes[:8] != self.b0000000000000000):
@@ -366,7 +367,7 @@ class KexGSSGex(object):
qhbyte <<= 1
qmask >>= 1
while True:
- x_bytes = self.transport.rng.read(byte_count)
+ x_bytes = os.urandom(byte_count)
x_bytes = byte_mask(x_bytes[0], qmask) + x_bytes[1:]
x = util.inflate_long(x_bytes, 1)
if (x > 1) and (x < q):