diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-29 22:44:47 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-29 22:44:47 -0400 |
| commit | 0a2c818366d5d7fe3b69f2d79e2a27438d79bd28 (patch) | |
| tree | 64b7c97a9ddd324689eb67242a05382ba0729ab2 /src | |
| parent | b2ecff2447e06c9cd5747228cb5bbf9d44bbcdfe (diff) | |
| parent | 89656cd08cf0369677b298f30ba754cb62e5009b (diff) | |
| download | cryptography-0a2c818366d5d7fe3b69f2d79e2a27438d79bd28.tar.gz cryptography-0a2c818366d5d7fe3b69f2d79e2a27438d79bd28.tar.bz2 cryptography-0a2c818366d5d7fe3b69f2d79e2a27438d79bd28.zip | |
Merge pull request #2307 from reaperhulk/fix-test-ordering
Resolve an unusual test bug related to initializing the bindings
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 7 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/binding.py | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 8c4abcd6..197bcb8c 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -529,13 +529,6 @@ class Backend(object): self._binding.init_static_locks() - # adds all ciphers/digests for EVP - self._lib.OpenSSL_add_all_algorithms() - # registers available SSL/TLS ciphers and digests - self._lib.SSL_library_init() - # loads error strings for libcrypto and libssl functions - self._lib.SSL_load_error_strings() - self._cipher_registry = {} self._register_default_ciphers() self.activate_osrandom_engine() diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py index e18d89c5..50d7f6d5 100644 --- a/src/cryptography/hazmat/bindings/openssl/binding.py +++ b/src/cryptography/hazmat/bindings/openssl/binding.py @@ -92,6 +92,12 @@ class Binding(object): if not cls._lib_loaded: cls.lib = build_conditional_library(lib, CONDITIONAL_NAMES) cls._lib_loaded = True + # initialize the SSL library + cls.lib.SSL_library_init() + # adds all ciphers/digests for EVP + cls.lib.OpenSSL_add_all_algorithms() + # loads error strings for libcrypto and libssl functions + cls.lib.SSL_load_error_strings() cls._register_osrandom_engine() @classmethod |