diff --git a/paramecio/citoplasma/keyutils.py b/paramecio/citoplasma/keyutils.py index ae91afb..4cb4b8a 100644 --- a/paramecio/citoplasma/keyutils.py +++ b/paramecio/citoplasma/keyutils.py @@ -16,4 +16,4 @@ def create_key(n=10): rand_bytes=urandom(n) - return b64encode(rand_bytes).decode('utf-8') + return b64encode(rand_bytes).decode('utf-8')[0:-2] diff --git a/paramecio/citoplasma/sendmail.py b/paramecio/citoplasma/sendmail.py index 60e832b..6b191fb 100644 --- a/paramecio/citoplasma/sendmail.py +++ b/paramecio/citoplasma/sendmail.py @@ -9,6 +9,8 @@ from email.mime.base import MIMEBase from email.mime.image import MIMEImage from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText +import ssl as ssl_module +import sys class SendMail: @@ -21,6 +23,12 @@ class SendMail: password='' ssl=True + + if sys.version_info < (3, 6): + + context = ssl_module.SSLContext(ssl_module.PROTOCOL_TLSv1_2) + else: + context = ssl_module.SSLContext(ssl_module.PROTOCOL_TLS) def __init__(self): @@ -32,8 +40,8 @@ class SendMail: if self.ssl==True: try: - - self.smtp.starttls() + + self.smtp.starttls(context=self.context) except smtplib.SMTPHeloError: @@ -79,9 +87,9 @@ class SendMail: return False - except smtplib.SMTPException: - - self.txt_error='Error: any method for login is avaliable' + except smtplib.SMTPException as e: + # self.txt_error=e.__str__() + self.txt_error='Error: any method for login is avaliable - '+e.__str__() return False diff --git a/paramecio/cromosoma/extrafields/passwordfield.py b/paramecio/cromosoma/extrafields/passwordfield.py index 580debe..2182dc8 100644 --- a/paramecio/cromosoma/extrafields/passwordfield.py +++ b/paramecio/cromosoma/extrafields/passwordfield.py @@ -44,7 +44,8 @@ try: #if crypt.METHOD_SHA512 in crypt.methods: - value = bcrypt_sha256.encrypt(value) + #value = bcrypt_sha256.encrypt(value) + value = bcrypt_sha256.hash(value) """ else: