aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-06-24 22:10:28 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-06-24 22:10:28 -0600
commit88dd94aac8f4195de462d333938e6eb7a9b8c633 (patch)
tree8eac892dc5072964f689f1bb49220e1f036dc78b
parent224f6f887272623d7bf59bd20069c6f3c40b3484 (diff)
downloadcryptography-88dd94aac8f4195de462d333938e6eb7a9b8c633.tar.gz
cryptography-88dd94aac8f4195de462d333938e6eb7a9b8c633.tar.bz2
cryptography-88dd94aac8f4195de462d333938e6eb7a9b8c633.zip
rename cipher->ciphers
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py2
-rw-r--r--cryptography/hazmat/backends/openssl/ciphers.py (renamed from cryptography/hazmat/backends/openssl/cipher.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 43d360a0..d08cd3e4 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -28,7 +28,7 @@ from cryptography.hazmat.backends.interfaces import (
HashBackend, PBKDF2HMACBackend, PKCS8SerializationBackend, RSABackend,
TraditionalOpenSSLSerializationBackend
)
-from cryptography.hazmat.backends.openssl.cipher import (
+from cryptography.hazmat.backends.openssl.ciphers import (
_AESCTRCipherContext, _CipherContext
)
from cryptography.hazmat.backends.openssl.dsa import (
diff --git a/cryptography/hazmat/backends/openssl/cipher.py b/cryptography/hazmat/backends/openssl/ciphers.py
index c3a5499a..c3a5499a 100644
--- a/cryptography/hazmat/backends/openssl/cipher.py
+++ b/cryptography/hazmat/backends/openssl/ciphers.py