aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py24
-rw-r--r--cryptography/hazmat/backends/openssl/osrand_engine.py (renamed from cryptography/hazmat/backends/openssl/urand_engine.py)46
-rw-r--r--tests/hazmat/backends/test_openssl.py46
3 files changed, 58 insertions, 58 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 93d15740..5a28b2d4 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -93,7 +93,7 @@ class Backend(object):
"rand",
"rsa",
"ssl",
- "urand_engine",
+ "osrand_engine",
"x509",
"x509name",
"x509v3",
@@ -107,7 +107,7 @@ class Backend(object):
self._cipher_registry = {}
self._register_default_ciphers()
- self.register_urandom_engine()
+ self.register_osrandom_engine()
@classmethod
def _ensure_ffi_initialized(cls):
@@ -172,36 +172,36 @@ class Backend(object):
cls.lib.OpenSSL_add_all_algorithms()
cls.lib.SSL_load_error_strings()
- # Add the urandom engine to the engine list
- res = cls.lib.Cryptography_add_urandom_engine()
+ # Add the osrandom engine to the engine list
+ res = cls.lib.Cryptography_add_osrandom_engine()
assert res == 1
- def unregister_urandom_engine(self):
+ def unregister_osrandom_engine(self):
e = self.lib.ENGINE_get_default_RAND()
if e != self.ffi.NULL:
name = self.lib.ENGINE_get_name(e)
assert name != self.ffi.NULL
- if name == self.lib.Cryptography_urandom_engine_name:
+ if name == self.lib.Cryptography_osrandom_engine_name:
self.lib.ENGINE_unregister_RAND(e)
# this resets the RNG to use the new engine
self.lib.RAND_cleanup()
res = self.lib.ENGINE_finish(e)
assert res == 1
- def register_urandom_engine(self):
+ def register_osrandom_engine(self):
current_rand = self.lib.ENGINE_get_default_RAND()
if current_rand != self.ffi.NULL:
name = self.lib.ENGINE_get_name(current_rand)
assert name != self.ffi.NULL
- if name != self.lib.Cryptography_urandom_engine_name:
- self._register_urandom_engine()
+ if name != self.lib.Cryptography_osrandom_engine_name:
+ self._register_osrandom_engine()
res = self.lib.ENGINE_finish(current_rand)
assert res == 1
else:
- self._register_urandom_engine()
+ self._register_osrandom_engine()
- def _register_urandom_engine(self):
- e = self.lib.ENGINE_by_id(self.lib.Cryptography_urandom_engine_id)
+ def _register_osrandom_engine(self):
+ e = self.lib.ENGINE_by_id(self.lib.Cryptography_osrandom_engine_id)
assert e != self.ffi.NULL
res = self.lib.ENGINE_init(e)
assert res == 1
diff --git a/cryptography/hazmat/backends/openssl/urand_engine.py b/cryptography/hazmat/backends/openssl/osrand_engine.py
index ff5e5613..b0cdf80f 100644
--- a/cryptography/hazmat/backends/openssl/urand_engine.py
+++ b/cryptography/hazmat/backends/openssl/osrand_engine.py
@@ -21,25 +21,25 @@ INCLUDES = """
"""
TYPES = """
-static const char *const Cryptography_urandom_engine_name;
-static const char *const Cryptography_urandom_engine_id;
+static const char *const Cryptography_osrandom_engine_name;
+static const char *const Cryptography_osrandom_engine_id;
"""
FUNCTIONS = """
-int Cryptography_add_urandom_engine(void);
+int Cryptography_add_osrandom_engine(void);
"""
MACROS = """
"""
CUSTOMIZATIONS = """
-static const char *Cryptography_urandom_engine_id= "urandom";
-static const char *Cryptography_urandom_engine_name = "urandom_engine";
+static const char *Cryptography_osrandom_engine_id= "osrandom";
+static const char *Cryptography_osrandom_engine_name = "osrandom_engine";
#ifndef _WIN32
static int urandom_fd = -1;
-static int urandom_rand_bytes(unsigned char *buffer, int size) {
+static int osrandom_rand_bytes(unsigned char *buffer, int size) {
ssize_t n;
while (0 < size) {
do {
@@ -55,7 +55,7 @@ static int urandom_rand_bytes(unsigned char *buffer, int size) {
return 1;
}
-static int urandom_rand_status(void) {
+static int osrandom_rand_status(void) {
if (urandom_fd == -1) {
return 0;
} else {
@@ -63,7 +63,7 @@ static int urandom_rand_status(void) {
}
}
-static int urandom_init(ENGINE *e) {
+static int osrandom_init(ENGINE *e) {
if (urandom_fd > -1) {
return 1;
}
@@ -75,7 +75,7 @@ static int urandom_init(ENGINE *e) {
}
}
-static int urandom_finish(ENGINE *e) {
+static int osrandom_finish(ENGINE *e) {
int n;
do {
n = close(urandom_fd);
@@ -92,7 +92,7 @@ static int urandom_finish(ENGINE *e) {
#ifdef _WIN32
static HCRYPTPROV hCryptProv = 0;
-static int urandom_init(ENGINE *e) {
+static int osrandom_init(ENGINE *e) {
if (hCryptProv > 0) {
return 1;
}
@@ -104,7 +104,7 @@ static int urandom_init(ENGINE *e) {
}
}
-static int urandom_rand_bytes(unsigned char *buffer, int size) {
+static int osrandom_rand_bytes(unsigned char *buffer, int size) {
size_t chunk;
if (hCryptProv == 0) {
@@ -122,7 +122,7 @@ static int urandom_rand_bytes(unsigned char *buffer, int size) {
return 1;
}
-static int urandom_finish(ENGINE *e) {
+static int osrandom_finish(ENGINE *e) {
if (CryptReleaseContext(hCryptProv, 0)) {
hCryptProv = 0;
return 1;
@@ -131,7 +131,7 @@ static int urandom_finish(ENGINE *e) {
}
}
-static int urandom_rand_status(void) {
+static int osrandom_rand_status(void) {
if (hCryptProv == 0) {
return 0;
} else {
@@ -140,25 +140,25 @@ static int urandom_rand_status(void) {
}
#endif /* MS_WINDOWS */
-static RAND_METHOD urandom_rand = {
+static RAND_METHOD osrandom_rand = {
NULL,
- urandom_rand_bytes,
+ osrandom_rand_bytes,
NULL,
NULL,
- urandom_rand_bytes,
- urandom_rand_status,
+ osrandom_rand_bytes,
+ osrandom_rand_status,
};
-int Cryptography_add_urandom_engine(void) {
+int Cryptography_add_osrandom_engine(void) {
ENGINE *e = ENGINE_new();
if (e == NULL) {
return 0;
}
- if(!ENGINE_set_id(e, Cryptography_urandom_engine_id) ||
- !ENGINE_set_name(e, Cryptography_urandom_engine_name) ||
- !ENGINE_set_RAND(e, &urandom_rand) ||
- !ENGINE_set_init_function(e, urandom_init) ||
- !ENGINE_set_finish_function(e, urandom_finish)) {
+ if(!ENGINE_set_id(e, Cryptography_osrandom_engine_id) ||
+ !ENGINE_set_name(e, Cryptography_osrandom_engine_name) ||
+ !ENGINE_set_RAND(e, &osrandom_rand) ||
+ !ENGINE_set_init_function(e, osrandom_init) ||
+ !ENGINE_set_finish_function(e, osrandom_finish)) {
return 0;
}
if (!ENGINE_add(e)) {
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 82832b10..3fabfe38 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -192,10 +192,10 @@ class TestOpenSSL(object):
# This test is not in the next class because to check if it's really
# default we don't want to run the setup_method before it
- def test_urandom_engine_is_default(self):
+ def test_osrandom_engine_is_default(self):
e = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(e)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_free(e)
assert res == 1
@@ -211,78 +211,78 @@ class TestOpenSSLRandomEngine(object):
# we need to reset state to being default. backend is a shared global
# for all these tests.
unregister_dummy_engine()
- backend.register_urandom_engine()
+ backend.register_osrandom_engine()
current_default = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(current_default)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
- def test_register_urandom_already_default(self):
+ def test_register_osrandom_already_default(self):
e = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(e)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_free(e)
assert res == 1
- backend.register_urandom_engine()
+ backend.register_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(e)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_free(e)
assert res == 1
- def test_unregister_urandom_engine_nothing_registered(self):
- backend.unregister_urandom_engine()
+ def test_unregister_osrandom_engine_nothing_registered(self):
+ backend.unregister_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
assert e == backend.ffi.NULL
- backend.unregister_urandom_engine()
+ backend.unregister_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
assert e == backend.ffi.NULL
- def test_unregister_urandom_engine(self):
+ def test_unregister_osrandom_engine(self):
e = backend.lib.ENGINE_get_default_RAND()
assert e != backend.ffi.NULL
name = backend.lib.ENGINE_get_name(e)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_free(e)
assert res == 1
- backend.unregister_urandom_engine()
+ backend.unregister_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
assert e == backend.ffi.NULL
- def test_register_urandom_no_default(self):
- backend.unregister_urandom_engine()
+ def test_register_osrandom_no_default(self):
+ backend.unregister_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
assert e == backend.ffi.NULL
- backend.register_urandom_engine()
+ backend.register_osrandom_engine()
e = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(e)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_free(e)
assert res == 1
- def test_unregister_urandom_other_engine_default(self):
+ def test_unregister_osrandom_other_engine_default(self):
register_dummy_engine()
default = backend.lib.ENGINE_get_default_RAND()
default_name = backend.lib.ENGINE_get_name(default)
assert default_name == dummy_engine.Cryptography_faux_engine_name
res = backend.lib.ENGINE_finish(default)
assert res == 1
- backend.unregister_urandom_engine()
+ backend.unregister_osrandom_engine()
current_default = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(current_default)
assert name == dummy_engine.Cryptography_faux_engine_name
res = backend.lib.ENGINE_finish(current_default)
assert res == 1
- def test_register_urandom_other_engine_default(self):
+ def test_register_osrandom_other_engine_default(self):
register_dummy_engine()
default = backend.lib.ENGINE_get_default_RAND()
default_name = backend.lib.ENGINE_get_name(default)
assert default_name == dummy_engine.Cryptography_faux_engine_name
res = backend.lib.ENGINE_finish(default)
assert res == 1
- backend.register_urandom_engine()
+ backend.register_osrandom_engine()
current_default = backend.lib.ENGINE_get_default_RAND()
name = backend.lib.ENGINE_get_name(current_default)
- assert name == backend.lib.Cryptography_urandom_engine_name
+ assert name == backend.lib.Cryptography_osrandom_engine_name
res = backend.lib.ENGINE_finish(current_default)
assert res == 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-12 18:04:23 +0000