This commit is contained in:
clowwindy 2014-09-09 14:43:32 +08:00
parent 1e1b1adba9
commit c9b489b5e3

View file

@ -224,7 +224,7 @@ def encrypt_all(password, method, op, data):
if method == 'salsa20-ctr': if method == 'salsa20-ctr':
cipher = encrypt_salsa20.Salsa20Cipher(method, key, iv, op) cipher = encrypt_salsa20.Salsa20Cipher(method, key, iv, op)
elif method == 'rc4-sha256': elif method == 'rc4-sha256':
return encrypt_rc4_sha256.create_cipher(method, key, iv, op) cipher = encrypt_rc4_sha256.create_cipher(method, key, iv, op)
else: else:
cipher = M2Crypto.EVP.Cipher(method.replace('-', '_'), key, iv, cipher = M2Crypto.EVP.Cipher(method.replace('-', '_'), key, iv,
op, key_as_bytes=0, d='md5', op, key_as_bytes=0, d='md5',