From b8cc2094c93cb63edf2b912f0186c8719e7b3c28 Mon Sep 17 00:00:00 2001 From: "Tobias Dussa (TGD)" <dussa@dfn-cert.de> Date: Wed, 25 Sep 2024 10:01:41 +0200 Subject: [PATCH] Switched to legacy interface to base64 so CRLF is added. --- reaction-mailcreate/createMails.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reaction-mailcreate/createMails.py b/reaction-mailcreate/createMails.py index 1ae43c3..9a41d17 100755 --- a/reaction-mailcreate/createMails.py +++ b/reaction-mailcreate/createMails.py @@ -111,8 +111,8 @@ if args.sign: match args.sign: case 'gpg' | 'gpgsm': # Import dependencies for GPG-based mail signing if necessary - from base64 import b64encode from email.mime.multipart import MIMEMultipart + import base64 import gnupg case 'openssl': # Import dependencies for OpenSSL-based mail signing if necessary @@ -311,7 +311,7 @@ def signMailGPG(message): signatureMessage['Content-Type'] = 'application/pkcs7-signature; name="smime.p7s"' signatureMessage['Content-Description'] = 'S/MIME digital signature' signatureMessage['Content-Transfer-Encoding'] = 'base64' - signature = b64encode(signature.encode('latin1')) + signature = base64.encodebytes(signature.encode('latin1')) signatureMessage.set_payload(signature) # Assemble new message -- GitLab