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 e8d7d957ce3ae5ee51fa0c715467cfd35b757542..4bc073a1ceb63f727d6022e5586d85d577084dbf 100644 (file)
--- a/ctypescrypto/rand.py
+++ b/ctypescrypto/rand.py
@@ -19,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):


@@ -36,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]


@@ -47,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: