Omnibus commited on
Commit
14cf141
·
1 Parent(s): b63fcfe

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +28 -3
app.py CHANGED
@@ -23,6 +23,7 @@ def create_key(passw):
23
  salt=salt,
24
  iterations=480000,
25
  )
 
26
 
27
  return kdf
28
 
@@ -38,7 +39,20 @@ def encrypt(passw=None,mes=None,img=None,document=None):
38
  print (bytes_e)
39
  #key = Fernet.generate_key()
40
 
41
- key = create_key(passw)
 
 
 
 
 
 
 
 
 
 
 
 
 
42
  key = base64.urlsafe_b64encode(kdf.derive(key))
43
  print (f'key == {key}')
44
 
@@ -57,9 +71,20 @@ def encrypt(passw=None,mes=None,img=None,document=None):
57
  def decrypt(passw=None,enc_in=None):
58
  enc_in=enc_in.strip('"')
59
  print (f'encoded string == {enc_in}')
60
- key = create_key(passw)
 
 
 
 
 
 
 
 
 
 
 
 
61
  key = base64.urlsafe_b64encode(kdf.derive(key))
62
- print (f'key == {key}')
63
 
64
  fernet = Fernet(key)
65
  decMessage = fernet.decrypt(enc_in).decode()
 
23
  salt=salt,
24
  iterations=480000,
25
  )
26
+ key = base64.urlsafe_b64encode(kdf.derive(key))
27
 
28
  return kdf
29
 
 
39
  print (bytes_e)
40
  #key = Fernet.generate_key()
41
 
42
+ #key = create_key(passw)
43
+ key = passw.encode()
44
+ h = hashlib.new('sha256')
45
+ h.update(key)
46
+ key = h.hexdigest()
47
+ key = key.encode()
48
+ #salt = os.urandom(16)
49
+ salt = key
50
+ kdf = PBKDF2HMAC(
51
+ algorithm=hashes.SHA256(),
52
+ length=32,
53
+ salt=salt,
54
+ iterations=480000,
55
+ )
56
  key = base64.urlsafe_b64encode(kdf.derive(key))
57
  print (f'key == {key}')
58
 
 
71
  def decrypt(passw=None,enc_in=None):
72
  enc_in=enc_in.strip('"')
73
  print (f'encoded string == {enc_in}')
74
+ key = passw.encode()
75
+ h = hashlib.new('sha256')
76
+ h.update(key)
77
+ key = h.hexdigest()
78
+ key = key.encode()
79
+ #salt = os.urandom(16)
80
+ salt = key
81
+ kdf = PBKDF2HMAC(
82
+ algorithm=hashes.SHA256(),
83
+ length=32,
84
+ salt=salt,
85
+ iterations=480000,
86
+ )
87
  key = base64.urlsafe_b64encode(kdf.derive(key))
 
88
 
89
  fernet = Fernet(key)
90
  decMessage = fernet.decrypt(enc_in).decode()