diff options
| author | Donald Stufft <donald@stufft.io> | 2013-10-27 16:44:30 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2013-10-28 08:37:33 -0400 |
| commit | f04317ae24441082279ea73ccca0a6630c33cc86 (patch) | |
| tree | b466055f23bd0ac01776202c0cde70bf7128e863 /cryptography | |
| parent | 01fbdf74967f8e22e3ea2d15f195898c64d34cc3 (diff) | |
| download | cryptography-f04317ae24441082279ea73ccca0a6630c33cc86.tar.gz cryptography-f04317ae24441082279ea73ccca0a6630c33cc86.tar.bz2 cryptography-f04317ae24441082279ea73ccca0a6630c33cc86.zip | |
Move primtives into a hazmat package
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/bindings/openssl/backend.py | 8 | ||||
| -rw-r--r-- | cryptography/hazmat/__init__.py | 12 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/__init__.py (renamed from cryptography/primitives/__init__.py) | 0 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/block/__init__.py (renamed from cryptography/primitives/block/__init__.py) | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/block/base.py (renamed from cryptography/primitives/block/base.py) | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/block/ciphers.py (renamed from cryptography/primitives/block/ciphers.py) | 0 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/block/modes.py (renamed from cryptography/primitives/block/modes.py) | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/hashes.py (renamed from cryptography/primitives/hashes.py) | 0 | ||||
| -rw-r--r-- | cryptography/hazmat/primitives/interfaces.py (renamed from cryptography/primitives/interfaces.py) | 0 |
9 files changed, 20 insertions, 6 deletions
diff --git a/cryptography/bindings/openssl/backend.py b/cryptography/bindings/openssl/backend.py index 4ec16189..3477d3ee 100644 --- a/cryptography/bindings/openssl/backend.py +++ b/cryptography/bindings/openssl/backend.py @@ -18,9 +18,11 @@ import sys import cffi -from cryptography.primitives import interfaces -from cryptography.primitives.block.ciphers import AES, Camellia, TripleDES -from cryptography.primitives.block.modes import CBC, CTR, ECB, OFB, CFB +from cryptography.hazmat.primitives import interfaces +from cryptography.hazmat.primitives.block.ciphers import ( + AES, Camellia, TripleDES, +) +from cryptography.hazmat.primitives.block.modes import CBC, CTR, ECB, OFB, CFB class Backend(object): diff --git a/cryptography/hazmat/__init__.py b/cryptography/hazmat/__init__.py new file mode 100644 index 00000000..55c925c6 --- /dev/null +++ b/cryptography/hazmat/__init__.py @@ -0,0 +1,12 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/cryptography/primitives/__init__.py b/cryptography/hazmat/primitives/__init__.py index e69de29b..e69de29b 100644 --- a/cryptography/primitives/__init__.py +++ b/cryptography/hazmat/primitives/__init__.py diff --git a/cryptography/primitives/block/__init__.py b/cryptography/hazmat/primitives/block/__init__.py index a0c6d03f..5b8942b6 100644 --- a/cryptography/primitives/block/__init__.py +++ b/cryptography/hazmat/primitives/block/__init__.py @@ -13,7 +13,7 @@ from __future__ import absolute_import, division, print_function -from cryptography.primitives.block.base import BlockCipher +from cryptography.hazmat.primitives.block.base import BlockCipher __all__ = [ diff --git a/cryptography/primitives/block/base.py b/cryptography/hazmat/primitives/block/base.py index 7924cf9c..b4cc32a4 100644 --- a/cryptography/primitives/block/base.py +++ b/cryptography/hazmat/primitives/block/base.py @@ -13,7 +13,7 @@ from __future__ import absolute_import, division, print_function -from cryptography.primitives import interfaces +from cryptography.hazmat.primitives import interfaces class BlockCipher(object): diff --git a/cryptography/primitives/block/ciphers.py b/cryptography/hazmat/primitives/block/ciphers.py index 4143b89d..4143b89d 100644 --- a/cryptography/primitives/block/ciphers.py +++ b/cryptography/hazmat/primitives/block/ciphers.py diff --git a/cryptography/primitives/block/modes.py b/cryptography/hazmat/primitives/block/modes.py index a933c187..a60e8a34 100644 --- a/cryptography/primitives/block/modes.py +++ b/cryptography/hazmat/primitives/block/modes.py @@ -13,7 +13,7 @@ from __future__ import absolute_import, division, print_function -from cryptography.primitives import interfaces +from cryptography.hazmat.primitives import interfaces @interfaces.register(interfaces.ModeWithInitializationVector) diff --git a/cryptography/primitives/hashes.py b/cryptography/hazmat/primitives/hashes.py index 023041cb..023041cb 100644 --- a/cryptography/primitives/hashes.py +++ b/cryptography/hazmat/primitives/hashes.py diff --git a/cryptography/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py index 49c19d0e..49c19d0e 100644 --- a/cryptography/primitives/interfaces.py +++ b/cryptography/hazmat/primitives/interfaces.py |