chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move self._view_on_starting() outside of loading keys exception

Browse Source 
When _view_on_starting is inside the try:except:, any display errors, especially from misconfigured plugins, will trigger the exception and delete RSA keys unnecessarily.
By moving _view_on_starting after the except: clause, only errors during key loading will lead to deleted keys. view errors will silently fail.

Signed-off-by: Sniffleupagus <129890632+Sniffleupagus@users.noreply.github.com>
This commit is contained in:
Sniffleupagus
2024-12-06 11:06:38 -08:00
committed by GitHub
parent 39c38d130b
commit 0c44b02765
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pwnagotchi/identity.py
View File

@ -50,10 +50,6 @@ class KeyPair(object):
with open(self.fingerprint_path, 'w+t') as fp: with open(self.fingerprint_path, 'w+t') as fp:
fp.write(self.fingerprint) fp.write(self.fingerprint)
# no exception, keys loaded correctly.
self._view.on_starting()
return
except Exception as e: except Exception as e:
# if we're here, loading the keys broke something ... # if we're here, loading the keys broke something ...
logging.exception("error loading keys, maybe corrupted, deleting and regenerating ...") logging.exception("error loading keys, maybe corrupted, deleting and regenerating ...")
@ -63,6 +59,9 @@ class KeyPair(object):
except: except:
pass pass
# no exception, keys loaded correctly.
self._view.on_starting()
return
def sign(self, message): def sign(self, message):
hasher = SHA256.new(message.encode("ascii")) hasher = SHA256.new(message.encode("ascii"))
signer = PKCS1_PSS.new(self.priv_key, saltLen=16) signer = PKCS1_PSS.new(self.priv_key, saltLen=16)