mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-25 00:38:58 +00:00
Code Issues Releases Wiki Activity

Handle special case where RSA.encrypt returns cipher text shorter than 256 bytes.

Browse source
This commit is contained in:
Jonas Borgström 2010-11-03 19:46:21 +01:00
parent 6fe6812df2
commit dafd75f4e6
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
darc/helpers.py
View file

@ -8,6 +8,17 @@
import stat
def zero_pad(data, length):
"""Make sure data is `length` bytes long by prepending zero bytes
>>> zero_pad('foo', 5)
'\\x00\\x00foo'
>>> zero_pad('foo', 3)
'foo'
"""
return '\0' * (length - len(data)) + data
def exclude_path(path, patterns):
"""Used by create and extract sub-commands to determine
if an item should be processed or not

6
darc/keychain.py
View file

@ -11,7 +11,7 @@
from Crypto.Util import Counter
from Crypto.Util.number import bytes_to_long
from .helpers import IntegrityError
from .helpers import IntegrityError, zero_pad
from .oaep import OAEP
@ -51,9 +51,9 @@ def open(self, path):
self.rsa_read = RSA.importKey(chain['rsa_read'])
self.rsa_create = RSA.importKey(chain['rsa_create'])
self.read_encrypted = OAEP(256, hash=SHA256).encode(self.read_key, os.urandom(32))
self.read_encrypted = self.rsa_read.encrypt(self.read_encrypted, '')[0]
self.read_encrypted = zero_pad(self.rsa_read.encrypt(self.read_encrypted, '')[0], 256)
self.create_encrypted = OAEP(256, hash=SHA256).encode(self.create_key, os.urandom(32))
self.create_encrypted = self.rsa_create.encrypt(self.create_encrypted, '')[0]
self.create_encrypted = zero_pad(self.rsa_create.encrypt(self.create_encrypted, '')[0], 256)
def encrypt(self, data, password):
salt = os.urandom(32)