X-Git-Url: https://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Frand.py;h=e179212a24480c08bd231e7b8ba82bf7513e6b24;hb=305f347018c18fa4183f8ec76177336881b713c9;hp=5d51eedd77fb30fc0ea3a31e2aa322a57b35e622;hpb=1ff9b1899959673512927b6afa317855908b7073;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/rand.py b/ctypescrypto/rand.py
index 5d51eed..e179212 100644
--- a/ctypescrypto/rand.py
+++ b/ctypescrypto/rand.py
@@ -1,68 +1,71 @@
 """
-	Interface to the OpenSSL pseudo-random generator
+    Interface to the OpenSSL pseudo-random generator
 """
 
 from ctypes import create_string_buffer, c_char_p, c_int, c_double
-from ctypescrypto import libcrypto
+from ctypescrypto import libcrypto, bintype
 from ctypescrypto.exception import LibCryptoError
 
+__all__ = ['RandError', 'bytes', 'pseudo_bytes', 'seed', 'status']
+
 class RandError(LibCryptoError):
-	pass
+    """ Exception raised when openssl function return error """
+    pass
 
-def bytes( num, check_result=False):
-	"""
-		Returns num bytes of cryptographically strong pseudo-random
-		bytes. If checkc_result is True, raises error if PRNG is not
-		seeded enough
-	"""
+def bytes(num, check_result=False):
+    """
+    Returns num bytes of cryptographically strong pseudo-random
+    bytes. If checkc_result is True, raises error if PRNG is not
+    seeded enough
+    """
 
-	if num <= 0 :
-		raise ValueError, "'num' should be > 0"
-	buffer = create_string_buffer(num)
-	result = libcrypto.RAND_bytes(buffer, num) 
-	if check_result and result == 0:
-		raise RandError, "Random Number Generator not seeded sufficiently"
-	return buffer.raw[:num]
+    if num <= 0:
+        raise ValueError("'num' should be > 0")
+    buf = create_string_buffer(num)
+    result = libcrypto.RAND_bytes(buf, num)
+    if check_result and result == 0:
+        raise RandError("Random Number Generator not seeded sufficiently")
+    return buf.raw[:num]
 
 def pseudo_bytes(num):
-	"""
-		Returns num bytes of pseudo random data.  Pseudo- random byte
-		sequences generated by pseudo_bytes() will be unique if
-		they are of sufficient length, but are not necessarily
-		unpredictable. They can be used for non-cryptographic purposes
-		and for certain purposes in cryptographic protocols, but usually
-		not for key generation etc.
-	"""
-	if num <= 0 :
-		raise ValueError, "'num' should be > 0"
-	buffer = create_string_buffer(num)
-	libcrypto.RAND_pseudo_bytes(buffer, num)
-	return buffer.raw[:num]
+    """
+    Returns num bytes of pseudo random data.  Pseudo- random byte
+    sequences generated by pseudo_bytes() will be unique if
+    they are of sufficient length, but are not necessarily
+    unpredictable. They can be used for non-cryptographic purposes
+    and for certain purposes in cryptographic protocols, but usually
+    not for key generation etc.
+    """
+    if num <= 0:
+        raise ValueError("'num' should be > 0")
+    buf = create_string_buffer(num)
+    libcrypto.RAND_pseudo_bytes(buf, num)
+    return buf.raw[:num]
 
 def seed(data, entropy=None):
-	"""
-		Seeds random generator with data.
-		If entropy is not None, it should be floating point(double)
-		value estimating amount of entropy  in the data (in bytes).
-	"""
-	if type(data) != type(""):
-		raise TypeError, "A string is expected"
-	ptr = c_char_p(data)
-	size = len(data)
-	if entropy is None:
-		libcrypto.RAND_seed(ptr, size)
-	else :
-		libcrypto.RAND_add(ptr, size, entropy)
+    """
+        Seeds random generator with data.
+        If entropy is not None, it should be floating point(double)
+        value estimating amount of entropy  in the data (in bytes).
+    """
+    if not isinstance(data, bintype):
+        raise TypeError("A string is expected")
+    ptr = c_char_p(data)
+    size = len(data)
+    if entropy is None:
+        libcrypto.RAND_seed(ptr, size)
+    else:
+        libcrypto.RAND_add(ptr, size, entropy)
 
 def status():
-	"""
-		Returns 1 if random generator is sufficiently seeded and 0
-		otherwise
-	"""
+    """
+    Returns 1 if random generator is sufficiently seeded and 0
+    otherwise
+    """
+
+    return libcrypto.RAND_status()
 
-	return libcrypto.RAND_status()
-	
-libcrypto.RAND_add.argtypes=(c_char_p,c_int,c_double)
-libcrypto.RAND_seed.argtypes=(c_char_p,c_int)
-libcrypto.RAND_pseudo_bytes.argtypes=(c_char_p,c_int)
-libcrypto.RAND_bytes.argtypes=(c_char_p,c_int)
+libcrypto.RAND_add.argtypes = (c_char_p, c_int, c_double)
+libcrypto.RAND_seed.argtypes = (c_char_p, c_int)
+libcrypto.RAND_pseudo_bytes.argtypes = (c_char_p, c_int)
+libcrypto.RAND_bytes.argtypes = (c_char_p, c_int)