aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2013-08-11 09:54:59 +0200
committerHynek Schlawack <hs@ox.cx>2013-08-11 09:54:59 +0200
commit425f5842958079ee45c24c5432ab0cf5e2db0f79 (patch)
tree00cfb8b045e708c0ea2139bcba0a11887b1801e1
parenta46ad0e09ab93114a9433ff69777e8952b37fdcd (diff)
downloadcryptography-425f5842958079ee45c24c5432ab0cf5e2db0f79.tar.gz
cryptography-425f5842958079ee45c24c5432ab0cf5e2db0f79.tar.bz2
cryptography-425f5842958079ee45c24c5432ab0cf5e2db0f79.zip
Add mandatory headers to files touched by this branch
-rw-r--r--cryptography/bindings/openssl/api.py2
-rw-r--r--cryptography/primitives/block/__init__.py15
-rw-r--r--cryptography/primitives/block/base.py2
-rw-r--r--cryptography/primitives/block/ciphers.py2
-rw-r--r--cryptography/primitives/block/modes.py2
-rw-r--r--tests/primitives/test_block.py2
-rw-r--r--tests/primitives/test_ciphers.py2
-rw-r--r--tests/primitives/test_nist.py3
8 files changed, 30 insertions, 0 deletions
diff --git a/cryptography/bindings/openssl/api.py b/cryptography/bindings/openssl/api.py
index 65a29b85..d9181d75 100644
--- a/cryptography/bindings/openssl/api.py
+++ b/cryptography/bindings/openssl/api.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
import cffi
diff --git a/cryptography/primitives/block/__init__.py b/cryptography/primitives/block/__init__.py
index e49fcf38..a0c6d03f 100644
--- a/cryptography/primitives/block/__init__.py
+++ b/cryptography/primitives/block/__init__.py
@@ -1,3 +1,18 @@
+# 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.
+
+from __future__ import absolute_import, division, print_function
+
from cryptography.primitives.block.base import BlockCipher
diff --git a/cryptography/primitives/block/base.py b/cryptography/primitives/block/base.py
index 2018138c..f4a04b35 100644
--- a/cryptography/primitives/block/base.py
+++ b/cryptography/primitives/block/base.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
# TODO: which binding is used should be an option somewhere
from enum import Enum
diff --git a/cryptography/primitives/block/ciphers.py b/cryptography/primitives/block/ciphers.py
index 3d76afa0..2e478705 100644
--- a/cryptography/primitives/block/ciphers.py
+++ b/cryptography/primitives/block/ciphers.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
class AES(object):
name = "AES"
diff --git a/cryptography/primitives/block/modes.py b/cryptography/primitives/block/modes.py
index 02f0219c..de31f086 100644
--- a/cryptography/primitives/block/modes.py
+++ b/cryptography/primitives/block/modes.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
class CBC(object):
name = "CBC"
diff --git a/tests/primitives/test_block.py b/tests/primitives/test_block.py
index 0407b0fa..774409ca 100644
--- a/tests/primitives/test_block.py
+++ b/tests/primitives/test_block.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
import binascii
import pretend
diff --git a/tests/primitives/test_ciphers.py b/tests/primitives/test_ciphers.py
index 891c5cf8..5ee9f223 100644
--- a/tests/primitives/test_ciphers.py
+++ b/tests/primitives/test_ciphers.py
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
import binascii
import pytest
diff --git a/tests/primitives/test_nist.py b/tests/primitives/test_nist.py
index dc265435..db5e0344 100644
--- a/tests/primitives/test_nist.py
+++ b/tests/primitives/test_nist.py
@@ -14,6 +14,9 @@
"""
Test using the NIST Test Vectors
"""
+
+from __future__ import absolute_import, division, print_function
+
import binascii
import os