Remove the padding from the BlockCipher API

2 files changed, 1 insertions, 18 deletions

diff --git a/cryptography/primitives/block/modes.py b/cryptography/primitives/block/modes.py
index 329c8d50..02f0219c 100644
--- a/cryptography/primitives/block/modes.py
+++ b/cryptography/primitives/block/modes.py
@@ -15,7 +15,6 @@
 class CBC(object):
     name = "CBC"
 
-    def __init__(self, initialization_vector, padding):
+    def __init__(self, initialization_vector):
         super(CBC, self).__init__()
         self.initialization_vector = initialization_vector
-        self.padding = padding
diff --git a/cryptography/primitives/block/padding.py b/cryptography/primitives/block/padding.py
deleted file mode 100644
index ebd5e5c8..00000000
--- a/cryptography/primitives/block/padding.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-
-class NoPadding(object):
-    pass