ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
This commit is contained in:
Luke Rogers 2013-11-27 16:55:04 +13:00
commit aa8ab33ccb
31 changed files with 113 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/encrypt.py
View file

@ -9,10 +9,10 @@ import json
import hashlib
# helper functions to pad and unpad a string to a specified block size
# <http://stackoverflow.com/questions/12524994/encrypt-decrypt-using-pycrypto-aes-256>
# <http://stackoverflow.com/questions/12524994/encrypt-decrypt-using-pycrypto-aes-256>
BS = AES.block_size
pad = lambda s: s + (BS - len(s) % BS) * chr(BS - len(s) % BS)
unpad = lambda s : s[0:-ord(s[-1])]
pad = lambda s: s + (BS - len(s) % BS) * chr(BS - len(s) % BS)
unpad = lambda s: s[0:-ord(s[-1])]
# helper functions to encrypt and encode a string with AES and base64
encode_aes = lambda c, s: base64.b64encode(c.encrypt(pad(s)))
@ -48,7 +48,7 @@ def encrypt(inp, bot=None, db=None, notice=None):
# if there is only one argument, return the help message
if len(split) == 1:
notice(encrypt.__doc__)
return
return
# generate the key from the password and salt
password = split[0]
@ -56,7 +56,7 @@ def encrypt(inp, bot=None, db=None, notice=None):
key = PBKDF2(password, salt)
# generate the IV and encode it to store in the database
iv = Random.new().read(AES.block_size);
iv = Random.new().read(AES.block_size)
iv_encoded = base64.b64encode(iv)
# create the AES cipher and encrypt/encode the text with it
@ -83,9 +83,9 @@ def decrypt(inp, bot=None, db=None, notice=None):
# if there is only one argument, return the help message
if len(split) == 1:
notice(decrypt.__doc__)
return
return
# generate the key from the password and salt
# generate the key from the password and salt
password = split[0]
salt = get_salt(bot)
key = PBKDF2(password, salt)
@ -99,4 +99,4 @@ def decrypt(inp, bot=None, db=None, notice=None):
# create AES cipher, decode text, decrypt text, and unpad it
cipher = AES.new(key, AES.MODE_CBC, iv)
return decode_aes(cipher, text)
return decode_aes(cipher, text)