s3lph/multischleuder
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages 2 Wiki Activity Actions

Broader exception clause for conflict mail encryption

Browse source
This commit is contained in:
s3lph 2022-04-17 01:11:48 +02:00
parent 96ec215e73
commit 235603e715
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multischleuder/conflict.py
View file

@ -76,7 +76,7 @@ class ConflictMessage:
# support every possible key algorithm yet, esp. it can't encrypt to ed25519 keys. # support every possible key algorithm yet, esp. it can't encrypt to ed25519 keys.
try: try:
mime: email.mime.base.MIMEBase = self._encrypt_message(msg) mime: email.mime.base.MIMEBase = self._encrypt_message(msg)
except pgpy.errors.PGPEncryptionError: except Exception:
mime = email.mime.text.MIMEText(msg, _subtype='plain', _charset='utf-8') mime = email.mime.text.MIMEText(msg, _subtype='plain', _charset='utf-8')
# Set all the email headers # Set all the email headers
mime['Subject'] = f'MultiSchleuder {self._schleuder} - Key Conflict' mime['Subject'] = f'MultiSchleuder {self._schleuder} - Key Conflict'