Stowage/pycryptodome
2
0
Fork 0
mirror of https://github.com/Legrandin/pycryptodome.git synced 2025-12-08 05:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various small fixes and clean ups

Browse source
This commit is contained in:
Helder Eijs 2018-04-03 11:18:31 +02:00
parent c1834322b6
commit 53be0708d7
5 changed files with 63 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Crypto/Cipher/PKCS1_v1_5.py
View file

@ -23,7 +23,7 @@
__all__ = [ 'new', 'PKCS115_Cipher' ]
from Crypto.Util.number import ceil_div, bytes_to_long, long_to_bytes
from Crypto.Util.py3compat import *
from Crypto.Util.py3compat import bord, _copy_bytes
import Crypto.Util.number
from Crypto import Random
@ -79,7 +79,7 @@ class PKCS115_Cipher:
mLen = len(message)
# Step 1
if mLen > k-11:
if mLen > k - 11:
raise ValueError("Plaintext is too long.")
# Step 2a
ps = []
@ -88,10 +88,10 @@ class PKCS115_Cipher:
if bord(new_byte[0]) == 0x00:
continue
ps.append(new_byte)
ps = b("").join(ps)
ps = b"".join(ps)
assert(len(ps) == k - mLen - 3)
# Step 2b
em = b('\x00\x02') + ps + bchr(0x00) + bstr(message)
em = b'\x00\x02' + ps + b'\x00' + _copy_bytes(None, None, message)
# Step 3a (OS2IP)
em_int = bytes_to_long(em)
# Step 3b (RSAEP)
@ -164,17 +164,17 @@ class PKCS115_Cipher:
if len(ciphertext) != k:
raise ValueError("Ciphertext with incorrect length.")
# Step 2a (O2SIP)
ct_int = bytes_to_long(bstr(ciphertext))
ct_int = bytes_to_long(ciphertext)
# Step 2b (RSADP)
m_int = self._key._decrypt(ct_int)
# Complete step 2c (I2OSP)
em = long_to_bytes(m_int, k)
# Step 3
sep = em.find(bchr(0x00),2)
if not em.startswith(b('\x00\x02')) or sep<10:
sep = em.find(b'\x00', 2)
if not em.startswith(b'\x00\x02') or sep < 10:
return sentinel
# Step 4
return em[sep+1:]
return em[sep + 1:]
def new(key, randfunc=None):