test_onion.py: drop separate padding method

This commit is contained in:
Anthony Towns 2015-10-04 15:21:06 +10:00
parent 75dceaf254
commit 53e13e69c9

View File

@ -76,15 +76,12 @@ class Onion(object):
self.get_secrets() self.get_secrets()
def padding(self):
ctx = Cipher(self.enckey, self.pad_iv, 1, ciphername='aes-128-ctr')
self.pad = ctx.ciphering(self.ZEROES)
def decrypt(self): def decrypt(self):
self.padding() ctx = Cipher(self.enckey, self.pad_iv, 1, ciphername='aes-128-ctr')
pad = ctx.ciphering(self.ZEROES)
ctx = Cipher(self.enckey, self.iv, 0, ciphername='aes-128-ctr') ctx = Cipher(self.enckey, self.iv, 0, ciphername='aes-128-ctr')
self.fwd = self.pad + ctx.ciphering(self.onion[:self.fwd_end]) self.fwd = pad + ctx.ciphering(self.onion[:self.fwd_end])
self.msg = ctx.ciphering(self.onion[self.fwd_end:self.msg_end]) self.msg = ctx.ciphering(self.onion[self.fwd_end:self.msg_end])
def tweak_sha(self, sha, d): def tweak_sha(self, sha, d):