Apply minimal padding.

SSL 3.0 requires minimal padding. (TLS doesn't require it but accepts it, so apply uniformly to both.) From Chromium.
trevp · Mar 24, 2015 · daf2e15 · daf2e15
1 parent fa8db51
commit daf2e15
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tlslite/tlsrecordlayer.py b/tlslite/tlsrecordlayer.py
@@ -592,9 +592,9 @@ def _sendMsg(self, msg, randomizeFirstBlock = True):
                     b = self.fixedIVBlock + b
 
                 #Add padding: b = b+ (macBytes + paddingBytes)
-                currentLength = len(b) + len(macBytes) + 1
+                currentLength = len(b) + len(macBytes)
                 blockLength = self._writeState.encContext.block_size
-                paddingLength = blockLength-(currentLength % blockLength)
+                paddingLength = blockLength - 1 - (currentLength % blockLength)
 
                 paddingBytes = bytearray([paddingLength] * (paddingLength+1))
                 if self.fault == Fault.badPadding: