aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-04-25 22:03:46 +0100
committerAlex Stapleton <alexs@prol.etari.at>2014-04-25 22:03:46 +0100
commit4f034181c870030ed5f2c67e830bc1ae67176f41 (patch)
tree5294f911f9c1ece2f2f20f7f767d875319f6be72
parent28091767ff7fdf80cb1d3ae45915949dfe9793b5 (diff)
parentbe4e43a5fe9c312f1cfc0511dfa4ef7438c5b20b (diff)
downloadcryptography-4f034181c870030ed5f2c67e830bc1ae67176f41.tar.gz
cryptography-4f034181c870030ed5f2c67e830bc1ae67176f41.tar.bz2
cryptography-4f034181c870030ed5f2c67e830bc1ae67176f41.zip
Merge pull request #970 from reaperhulk/tiny-fix
backend->self in a few places
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 16b963ae..2d7e2307 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -351,7 +351,7 @@ class Backend(object):
def _new_evp_pkey(self):
evp_pkey = self._lib.EVP_PKEY_new()
assert evp_pkey != self._ffi.NULL
- return self._ffi.gc(evp_pkey, backend._lib.EVP_PKEY_free)
+ return self._ffi.gc(evp_pkey, self._lib.EVP_PKEY_free)
def _rsa_private_key_to_evp_pkey(self, private_key):
evp_pkey = self._new_evp_pkey()
@@ -580,8 +580,8 @@ class Backend(object):
def cmac_algorithm_supported(self, algorithm):
return (
- backend._lib.Cryptography_HAS_CMAC == 1
- and backend.cipher_supported(algorithm, CBC(
+ self._lib.Cryptography_HAS_CMAC == 1
+ and self.cipher_supported(algorithm, CBC(
b"\x00" * algorithm.block_size))
)