Covered StackOfX509 by tests, fixed some typos in pkey docstrings

[oss/ctypescrypto.git] / ctypescrypto / rand.py

diff --git a/ctypescrypto/rand.py b/ctypescrypto/rand.py
index 5d51eedd77fb30fc0ea3a31e2aa322a57b35e622..4bc073a1ceb63f727d6022e5586d85d577084dbf 100644 (file)
--- a/ctypescrypto/rand.py
+++ b/ctypescrypto/rand.py
@@ -6,6 +6,8 @@ from ctypes import create_string_buffer, c_char_p, c_int, c_double
 from ctypescrypto import libcrypto
 from ctypescrypto.exception import LibCryptoError
 
 from ctypescrypto import libcrypto
 from ctypescrypto.exception import LibCryptoError
 

+__all__ = ['RandError','bytes','pseudo_bytes','seed','status']
+

 class RandError(LibCryptoError):
        pass
 
 class RandError(LibCryptoError):
        pass
 


@@ -17,11 +19,11 @@ def bytes( num, check_result=False):
        """
 
        if num <= 0 :
        """
 
        if num <= 0 :

-               raise ValueError, "'num' should be > 0"
+               raise ValueError("'num' should be > 0")

        buffer = create_string_buffer(num)
        result = libcrypto.RAND_bytes(buffer, num) 
        if check_result and result == 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"
+               raise RandError("Random Number Generator not seeded sufficiently")

        return buffer.raw[:num]
 
 def pseudo_bytes(num):
        return buffer.raw[:num]
 
 def pseudo_bytes(num):


@@ -34,7 +36,7 @@ def pseudo_bytes(num):
                not for key generation etc.
        """
        if num <= 0 :
                not for key generation etc.
        """
        if num <= 0 :

-               raise ValueError, "'num' should be > 0"
+               raise ValueError("'num' should be > 0")

        buffer = create_string_buffer(num)
        libcrypto.RAND_pseudo_bytes(buffer, num)
        return buffer.raw[:num]
        buffer = create_string_buffer(num)
        libcrypto.RAND_pseudo_bytes(buffer, num)
        return buffer.raw[:num]


@@ -45,8 +47,8 @@ def seed(data, entropy=None):
                If entropy is not None, it should be floating point(double)
                value estimating amount of entropy  in the data (in bytes).
        """
                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"
+       if not isinstance(data,str):
+               raise TypeError("A string is expected")

        ptr = c_char_p(data)
        size = len(data)
        if entropy is None:
        ptr = c_char_p(data)
        size = len(data)
        if entropy is None: