diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-04 12:00:43 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-09-04 12:00:43 -0500 |
| commit | 8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb (patch) | |
| tree | 37436d6d1502532d40e78b3ea337cd084f59622e /src | |
| parent | 7402cf1c676ffb7ba48d6e90227bb4b1397af12d (diff) | |
| parent | cad58d7bfa1a01ade66828498dcb2894993838b9 (diff) | |
| download | cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.tar.gz cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.tar.bz2 cryptography-8359190f6e509fa2d12c0d86c9dfd1a8b35bf9cb.zip | |
Merge branch 'master' into static-linking-osx
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 |