aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlyph <glyph@twistedmatrix.com>2015-06-27 18:41:16 -0700
committerGlyph <glyph@twistedmatrix.com>2015-06-27 18:41:16 -0700
commit1e3ffe10719ef8eeeda0df79aa3e708400f7028a (patch)
treeb1653800ced15b9a6ff03520b0cf8b0bb8a1e99a /src
parenteb8059d7bd4abc11a14bdf149812057d505a2685 (diff)
downloadcryptography-1e3ffe10719ef8eeeda0df79aa3e708400f7028a.tar.gz
cryptography-1e3ffe10719ef8eeeda0df79aa3e708400f7028a.tar.bz2
cryptography-1e3ffe10719ef8eeeda0df79aa3e708400f7028a.zip
handle previous registration by raising RuntimeError
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/bindings/openssl/binding.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index 727522a3..be9904a2 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -46,8 +46,7 @@ def _register_osrandom_engine():
assert lib.ERR_peek_error() == 0
looked_up_engine = lib.ENGINE_by_id(_osrandom_engine_id)
if looked_up_engine != ffi.NULL:
- assert lib.ERR_peek_error() == 0
- return 2
+ raise RuntimeError("osrandom engine already registered")
lib.ERR_clear_error()
@@ -64,7 +63,6 @@ def _register_osrandom_engine():
finally:
result = lib.ENGINE_free(engine)
assert result == 1
- return 1
class Binding(object):