Skip to content

Commit d9c696a

Browse files
padding.py: less verbose
1 parent 98c4816 commit d9c696a

File tree

1 file changed

+9
-9
lines changed
  • internal_filesystem/lib/cryptography/hazmat/primitives

1 file changed

+9
-9
lines changed

internal_filesystem/lib/cryptography/hazmat/primitives/padding.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ def update(self, data):
1919
if len(self._buffer) >= block_size:
2020
to_return = self._buffer[:len(self._buffer) - (len(self._buffer) % block_size)]
2121
self._buffer = self._buffer[len(to_return):]
22-
print(f"PKCS7PaddingContext.update returning: {to_return.hex()}")
22+
#print(f"PKCS7PaddingContext.update returning: {to_return.hex()}")
2323
return to_return
24-
print(f"PKCS7PaddingContext.update buffer: {self._buffer.hex()}")
24+
#print(f"PKCS7PaddingContext.update buffer: {self._buffer.hex()}")
2525
return b''
2626

2727
def finalize(self):
2828
pad_length = self.block_size - (len(self._buffer) % self.block_size)
2929
padding = bytes([pad_length] * pad_length)
3030
self._buffer.extend(padding)
3131
result = bytes(self._buffer)
32-
print(f"PKCS7PaddingContext.finalize pad_length: {pad_length}, padding: {padding.hex()}, result: {result.hex()}")
32+
#print(f"PKCS7PaddingContext.finalize pad_length: {pad_length}, padding: {padding.hex()}, result: {result.hex()}")
3333
self._buffer = bytearray()
3434
return result
3535

@@ -41,30 +41,30 @@ def __init__(self, block_size):
4141

4242
def update(self, data):
4343
self._buffer.extend(data)
44-
print(f"unpadder self._buffer is {self._buffer.hex()}")
44+
#print(f"unpadder self._buffer is {self._buffer.hex()}")
4545
block_size = self.block_size
4646
# Return all complete blocks except the last one
4747
if len(self._buffer) >= block_size * 2: # At least two blocks
4848
to_return = self._buffer[:len(self._buffer) - block_size]
4949
self._buffer = self._buffer[len(to_return):]
50-
print(f"unpadder self._buffer is now {self._buffer.hex()} and returning {to_return.hex()}")
50+
#print(f"unpadder self._buffer is now {self._buffer.hex()} and returning {to_return.hex()}")
5151
return to_return
52-
print(f"unpadder self._buffer retained: {self._buffer.hex()}")
52+
#print(f"unpadder self._buffer retained: {self._buffer.hex()}")
5353
return b''
5454

5555
def finalize(self):
56-
print(f"unpadder finalize self._buffer: {self._buffer.hex()}")
56+
#print(f"unpadder finalize self._buffer: {self._buffer.hex()}")
5757
if not self._buffer or len(self._buffer) % self.block_size != 0:
5858
raise ValueError(f"Invalid padding A: buffer {self._buffer.hex()}, length {len(self._buffer)}, remainder {len(self._buffer) % self.block_size}")
5959
pad_length = self._buffer[-1]
60-
print(f"unpadder finalize pad_length: {pad_length}, last {pad_length} bytes: {self._buffer[-pad_length:].hex()}")
60+
#print(f"unpadder finalize pad_length: {pad_length}, last {pad_length} bytes: {self._buffer[-pad_length:].hex()}")
6161
if pad_length > self.block_size or pad_length == 0:
6262
raise ValueError(f"Invalid padding B: pad_length {pad_length}")
6363
if self._buffer[-pad_length:] != bytes([pad_length] * pad_length):
6464
raise ValueError(f"Invalid padding C: expected {pad_length} bytes of {pad_length:02x}, got {self._buffer[-pad_length:].hex()}")
6565
result = bytes(self._buffer[:-pad_length])
6666
self._buffer = bytearray()
67-
print(f"unpadder finalize result: {result.hex()}")
67+
#print(f"unpadder finalize result: {result.hex()}")
6868
return result
6969

7070
class PKCS7:

0 commit comments

Comments
 (0)