summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-07-13 18:02:37 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-07-13 18:02:37 +0000
commit53bf2f7aa082bc1dbeba3e6d5fbbc43a3bc13e69 (patch)
tree4d007cefe70d512e2d7cda507a901078390ca378 /src
parent1883a50bb83fd04992b78cc0055b6befed234831 (diff)
downloadbcfg2-53bf2f7aa082bc1dbeba3e6d5fbbc43a3bc13e69.tar.gz
bcfg2-53bf2f7aa082bc1dbeba3e6d5fbbc43a3bc13e69.tar.bz2
bcfg2-53bf2f7aa082bc1dbeba3e6d5fbbc43a3bc13e69.zip
...
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3439 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rwxr-xr-xsrc/lib/tlslite/utils/__init__.py1
-rwxr-xr-xsrc/lib/tlslite/utils/cryptomath.py5
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/tlslite/utils/__init__.py b/src/lib/tlslite/utils/__init__.py
index e96b4bef8..cd8baebe7 100755
--- a/src/lib/tlslite/utils/__init__.py
+++ b/src/lib/tlslite/utils/__init__.py
@@ -17,6 +17,7 @@ __all__ = ["AES",
"OpenSSL_RC4",
"OpenSSL_RSAKey",
"OpenSSL_TripleDES",
+ "prngd: prngd module"
"PyCrypto_AES",
"PyCrypto_RC4",
"PyCrypto_RSAKey",
diff --git a/src/lib/tlslite/utils/cryptomath.py b/src/lib/tlslite/utils/cryptomath.py
index 204bb485c..fa02823bb 100755
--- a/src/lib/tlslite/utils/cryptomath.py
+++ b/src/lib/tlslite/utils/cryptomath.py
@@ -102,11 +102,10 @@ except:
# Else see if we ahve Pprngd running
try:
def getRandomBytes(howMany):
- import prngd
try:
- p = prngd.PRNGD(sockname="/var/run/egd-pool")
+ p = PRNGD(sockname="/var/run/egd-pool")
except:
- p = prngd.PRNGD(sockname="/dev/egd-pool")
+ p = PRNGD(sockname="/dev/egd-pool")
return stringToBytes(p.read(howMany))
prngName = "PRNGD"
except: