diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-03 17:30:19 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-03 17:30:19 -0600 |
| commit | 89d19a411edba0cb52da89801e3de1ddfd9f0dc5 (patch) | |
| tree | 6a0415374417aff7e61d50bb3e5b773ff813e569 /cryptography | |
| parent | 5b828b142b4e8fea021567038e2dba6cf6cd9221 (diff) | |
| download | cryptography-89d19a411edba0cb52da89801e3de1ddfd9f0dc5.tar.gz cryptography-89d19a411edba0cb52da89801e3de1ddfd9f0dc5.tar.bz2 cryptography-89d19a411edba0cb52da89801e3de1ddfd9f0dc5.zip | |
rename ModeWithAAD to ModeWithAuthenticationTag
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/primitives/ciphers/base.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/ciphers/modes.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/interfaces.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/hazmat/primitives/ciphers/base.py b/cryptography/hazmat/primitives/ciphers/base.py index f24fd000..cdaf2c0c 100644 --- a/cryptography/hazmat/primitives/ciphers/base.py +++ b/cryptography/hazmat/primitives/ciphers/base.py @@ -42,7 +42,7 @@ class Cipher(object): return self._wrap_ctx(ctx, False) def _wrap_ctx(self, ctx, encrypt): - if isinstance(self.mode, interfaces.ModeWithAAD): + if isinstance(self.mode, interfaces.ModeWithAuthenticationTag): if encrypt: return _AEADEncryptionContext(ctx) else: diff --git a/cryptography/hazmat/primitives/ciphers/modes.py b/cryptography/hazmat/primitives/ciphers/modes.py index cb191d98..e1c70185 100644 --- a/cryptography/hazmat/primitives/ciphers/modes.py +++ b/cryptography/hazmat/primitives/ciphers/modes.py @@ -60,7 +60,7 @@ class CTR(object): @utils.register_interface(interfaces.Mode) @utils.register_interface(interfaces.ModeWithInitializationVector) -@utils.register_interface(interfaces.ModeWithAAD) +@utils.register_interface(interfaces.ModeWithAuthenticationTag) class GCM(object): name = "GCM" diff --git a/cryptography/hazmat/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py index 1884e560..582876fe 100644 --- a/cryptography/hazmat/primitives/interfaces.py +++ b/cryptography/hazmat/primitives/interfaces.py @@ -56,7 +56,7 @@ class ModeWithNonce(six.with_metaclass(abc.ABCMeta)): """ -class ModeWithAAD(six.with_metaclass(abc.ABCMeta)): +class ModeWithAuthenticationTag(six.with_metaclass(abc.ABCMeta)): @abc.abstractproperty def tag(self): """ |