aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyph <glyph@twistedmatrix.com>2015-06-27 18:43:45 -0700
committerGlyph <glyph@twistedmatrix.com>2015-06-27 18:43:45 -0700
commit3abff3a85ce23577e914b2132795ae1b0ff0a684 (patch)
treeb20f16b3f4da9b5f243432e45bc4e359d65634a9
parent1e3ffe10719ef8eeeda0df79aa3e708400f7028a (diff)
downloadcryptography-3abff3a85ce23577e914b2132795ae1b0ff0a684.tar.gz
cryptography-3abff3a85ce23577e914b2132795ae1b0ff0a684.tar.bz2
cryptography-3abff3a85ce23577e914b2132795ae1b0ff0a684.zip
nothing pseudo about it
-rw-r--r--src/cryptography/hazmat/bindings/openssl/binding.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index be9904a2..dd26fe1b 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -13,7 +13,7 @@ _osrandom_engine_id = ffi.new("const char[]", b"osrandom")
_osrandom_engine_name = ffi.new("const char[]", b"osrandom_engine")
-@ffi.callback("int (*)(unsigned char *, int)", error=0)
+@ffi.callback("int (*)(unsigned char *, int)", error=-1)
def osrandom_rand_bytes(buf, size):
signed = ffi.cast("char *", buf)
result = os.urandom(size)
@@ -21,15 +21,6 @@ def osrandom_rand_bytes(buf, size):
return 1
-@ffi.callback("int (*)(unsigned char *, int)", error=0)
-def osrandom_pseudo_rand_bytes(buf, size):
- result = osrandom_rand_bytes(buf, size)
- if result == 0:
- return -1
- else:
- return result
-
-
@ffi.callback("int (*)(void)")
def osrandom_rand_status():
return 1
@@ -37,7 +28,7 @@ def osrandom_rand_status():
method = ffi.new(
"RAND_METHOD*", dict(bytes=osrandom_rand_bytes,
- pseudorand=osrandom_pseudo_rand_bytes,
+ pseudorand=osrandom_rand_bytes,
status=osrandom_rand_status)
)