From e5dd6f23b523e22d2792c73b0751fbe5292ee572 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Mon, 3 Aug 2015 15:40:06 -0400 Subject: [PATCH] don't sign unencrypted replies writing code that creates detached mime signatures in a way that enigmail will accept as valid is proving to be quite difficult. (i only got it to work for mutt.) if i find a way to make messages validate i will add that feature back into the program. --- edward | 79 +++++++-------------- run-tests | 2 +- tests/flatten-1.eml | 23 ++++++ tests/{gpg-flatten-11.out => flatten-1.out} | 0 tests/flatten-2.eml | 41 +++++++++++ tests/flatten-2.out | 13 ++++ tests/{gpg-flatten-7.eml => flatten-3.eml} | 0 tests/{gpg-flatten-7.out => flatten-3.out} | 0 tests/{gpg-flatten-8.eml => flatten-4.eml} | 0 tests/{gpg-flatten-10.out => flatten-4.out} | 0 tests/{gpg-flatten-9.eml => flatten-5.eml} | 0 tests/{gpg-flatten-9.out => flatten-5.out} | 0 tests/{gpg-flatten-10.eml => flatten-6.eml} | 0 tests/{gpg-flatten-8.out => flatten-6.out} | 0 tests/{gpg-flatten-11.eml => flatten-7.eml} | 0 tests/flatten-7.out | 11 +++ tests/gpg-flatten-3.eml | 36 ++++++---- tests/gpg-flatten-3.out | 4 +- tests/gpg-flatten-4.eml | 62 ++++++++-------- tests/gpg-flatten-4.out | 27 ++++--- tests/gpg-flatten-5.eml | 33 --------- tests/gpg-flatten-5.out | 9 --- tests/gpg-flatten-6.eml | 43 ----------- tests/gpg-flatten-6.out | 20 ------ 24 files changed, 189 insertions(+), 214 deletions(-) create mode 100644 tests/flatten-1.eml rename tests/{gpg-flatten-11.out => flatten-1.out} (100%) create mode 100644 tests/flatten-2.eml create mode 100644 tests/flatten-2.out rename tests/{gpg-flatten-7.eml => flatten-3.eml} (100%) rename tests/{gpg-flatten-7.out => flatten-3.out} (100%) rename tests/{gpg-flatten-8.eml => flatten-4.eml} (100%) rename tests/{gpg-flatten-10.out => flatten-4.out} (100%) rename tests/{gpg-flatten-9.eml => flatten-5.eml} (100%) rename tests/{gpg-flatten-9.out => flatten-5.out} (100%) rename tests/{gpg-flatten-10.eml => flatten-6.eml} (100%) rename tests/{gpg-flatten-8.out => flatten-6.out} (100%) rename tests/{gpg-flatten-11.eml => flatten-7.eml} (100%) create mode 100644 tests/flatten-7.out delete mode 100644 tests/gpg-flatten-5.eml delete mode 100644 tests/gpg-flatten-5.out delete mode 100644 tests/gpg-flatten-6.eml delete mode 100644 tests/gpg-flatten-6.out diff --git a/edward b/edward index bb867ef..4d1c67a 100755 --- a/edward +++ b/edward @@ -44,6 +44,7 @@ import email.parser import email.message import email.encoders +from email.mime.text import MIMEText from email.mime.multipart import MIMEMultipart from email.mime.application import MIMEApplication from email.mime.nonmultipart import MIMENonMultipart @@ -1142,45 +1143,42 @@ def generate_encrypted_mime (plaintext, email_to, email_subject, encrypt_to_key, A string version of the mime message, possibly encrypted and signed. """ - # quoted printable encoding lets most ascii characters look normal - # before the mime message is decoded. - char_set = email.charset.Charset("utf-8") - char_set.body_encoding = email.charset.QP + if (encrypt_to_key != None): - # MIMEText doesn't allow setting the text encoding - # so we use MIMENonMultipart. - plaintext_mime = MIMENonMultipart('text', 'plain') - plaintext_mime.set_payload(plaintext, charset=char_set) + # quoted printable encoding lets most ascii characters look normal + # before the mime message is decoded. + char_set = email.charset.Charset("utf-8") + char_set.body_encoding = email.charset.QP - if (encrypt_to_key != None): + # MIMEText doesn't allow setting the text encoding + # so we use MIMENonMultipart. + plaintext_mime = MIMENonMultipart('text', 'plain') + plaintext_mime.set_payload(plaintext, charset=char_set) encrypted_text = encrypt_sign_message(plaintext_mime.as_string(), encrypt_to_key, gpgme_ctx) - gpg_payload = encrypted_text - else: - signed_text = sign_message(plaintext_mime.as_string(), gpgme_ctx) - gpg_payload = signed_text + control_mime = MIMEApplication("Version: 1", + _subtype='pgp-encrypted', + _encoder=email.encoders.encode_7or8bit) + control_mime['Content-Description'] = 'PGP/MIME version identification' + control_mime.set_charset('us-ascii') - control_mime = MIMEApplication("Version: 1", - _subtype='pgp-encrypted', - _encoder=email.encoders.encode_7or8bit) - control_mime['Content-Description'] = 'PGP/MIME version identification' - control_mime.set_charset('us-ascii') + encoded_mime = MIMEApplication(encrypted_text, + _subtype='octet-stream; name="encrypted.asc"', + _encoder=email.encoders.encode_7or8bit) + encoded_mime['Content-Description'] = 'OpenPGP encrypted message' + encoded_mime['Content-Disposition'] = 'inline; filename="encrypted.asc"' + encoded_mime.set_charset('us-ascii') - encoded_mime = MIMEApplication(gpg_payload, - _subtype='octet-stream; name="encrypted.asc"', - _encoder=email.encoders.encode_7or8bit) - encoded_mime['Content-Description'] = 'OpenPGP encrypted message' - encoded_mime['Content-Disposition'] = 'inline; filename="encrypted.asc"' - encoded_mime.set_charset('us-ascii') - - message_mime = MIMEMultipart(_subtype="encrypted", protocol="application/pgp-encrypted") - message_mime.attach(control_mime) - message_mime.attach(encoded_mime) - message_mime['Content-Disposition'] = 'inline' + message_mime = MIMEMultipart(_subtype="encrypted", protocol="application/pgp-encrypted") + message_mime.attach(control_mime) + message_mime.attach(encoded_mime) + message_mime['Content-Disposition'] = 'inline' + else: + message_mime = MIMEText(plaintext) message_mime['To'] = email_to message_mime['Subject'] = email_subject @@ -1247,29 +1245,6 @@ def encrypt_sign_message (plaintext, encrypt_to_key, gpgme_ctx): return encrypted_txt -def sign_message (plaintext, gpgme_ctx): - """Signs plaintext - - This signs a message. - - Args: - plaintext: text to sign - gpgme_ctx: the gpgme context - - Returns: - An armored signature as a string of text - """ - - # the plaintext should be mime encoded in an ascii-compatible form - plaintext_bytes = io.BytesIO(plaintext.encode('ascii')) - signed_bytes = io.BytesIO() - - gpgme_ctx.sign(plaintext_bytes, signed_bytes, gpgme.SIG_MODE_NORMAL) - - signed_txt = signed_bytes.getvalue().decode('ascii') - return signed_txt - - def error (error_msg): """Write an error message to stdout diff --git a/run-tests b/run-tests index e37cb84..179fb1c 100755 --- a/run-tests +++ b/run-tests @@ -19,7 +19,7 @@ NUM_TESTS=1 #TEST_TYPES="gpg-flatten flatten plain" -TEST_TYPES="gpg-flatten" +TEST_TYPES="gpg-flatten flatten" function _main { diff --git a/tests/flatten-1.eml b/tests/flatten-1.eml new file mode 100644 index 0000000..d6409ee --- /dev/null +++ b/tests/flatten-1.eml @@ -0,0 +1,23 @@ +From: No One +To: No One +Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= + + +DO YOU READ ME CAPTAIN??!!1 o_O + +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +hi, i didn't encrypt this part. is that a mistake? + +bye! + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iJwEAQECAAYFAlWthWEACgkQsT5tL2pPbuhyWgQApzhIt4EM4FrqCibNI7ZS1V73 +yhml95bw5PXq2fB7wU2I4pkM30T2kpMxdtfHdPXHQSzvuo27IhrUOH7CUtvj0f23 +CllwAGoUmwmdXOLeVvgjwyPzSVAdWLO8/231fS1M8J42v8GV6w78hmq+/Cck2oQE +p4/91AVSikY7bwMrGpU= +=Tavv +-----END PGP SIGNATURE----- diff --git a/tests/gpg-flatten-11.out b/tests/flatten-1.out similarity index 100% rename from tests/gpg-flatten-11.out rename to tests/flatten-1.out diff --git a/tests/flatten-2.eml b/tests/flatten-2.eml new file mode 100644 index 0000000..baaca45 --- /dev/null +++ b/tests/flatten-2.eml @@ -0,0 +1,41 @@ +From: No One +To: No One +Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= + +DO YOU READ ME CAPTAIN??!!1 o_O + +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +hi, i didn't encrypt this part. is that a mistake? + +bye! + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iJwEAQECAAYFAlWthWEACgkQsT5tL2pPbuhyWgQApzhIt4EM4FrqCibNI7ZS1V73 +yhml95bw5PXq2fB7wU2I4pkM30T2kpMxdtfHdPXHQSzvuo27IhrUOH7CUtvj0f23 +CllwAGoUmwmdXOLeVvgjwyPzSVAdWLO8/231fS1M8J42v8GV6w78hmq+/Cck2oQE +p4/91AVSikY7bwMrGpU= +=Tavv +-----END PGP SIGNATURE----- + +-----BEGIN PGP MESSAGE----- +Version: GnuPG v1 + +hIwDWouAYlp2iv8BBADAXsI9Y/miNCVnseKDNZVil3VK3SUbJ4DYoVDVcymcStUw ++bmk3XSk5hqap3CfSKdSvdnxSmaKzYOdpv03kiRtK2gjnakcKxk4pGz85UM5t8ZZ +3estj/Ca40kvSHZAYelgC1W8JshDOyOrS93acfUgJxKQMdxhGRjVAW1YbQWFyNLA +3QEJJeg6obNktEbhXCSlupZFAKJQgdAPDOWYgNeFnTkS4MttM+G0ABx/o8JjeIl5 +wYDucFBDHXSuld9RBzQ1QLOUhB8BOkCq6XFgwaaTKTBT7SQ19n0G8RpZmJ/BX5Ok +msi9nlRm9z6Irjtx9bDudzUfpCzO/YeYBN1J/1o3pw8f/otzOMfRHBStkdo0V9i5 +9JS77QRkSnM4hVrZuvfplYa5iRftdYehLMaMk7k9gOY+B5WEMdgV9ZWRrWOXmqTK +NyB1fIWgKNEqCgZnBFPS6Es6kUXUNnFvsvFMPg5WXx+HBJ3YqhNzsdVegagxjE9F +wi7qHlcHbRGFv7Zz+BsiPQ3M3tQgwBAd1c/d/6CIdZDArvsTZiSdkszpfeziVj2p +ZKhWUBUIpqP59MMlftD19EFTtJm8mpc/gBH074nEwzXdLFKg08Vb5fH2zMRo37w4 +HZzUHFJaj8VMIjQPRXqD6ELclHJbO7ASTyh8S+v9Iv+t4PpJXn8odwAm08bd//e9 +Ch/H9RAlS/22W4KlpZdIvwz7JmwVE9T4Xq1e22Df +=Sn5u +-----END PGP MESSAGE----- + diff --git a/tests/flatten-2.out b/tests/flatten-2.out new file mode 100644 index 0000000..a8bf99c --- /dev/null +++ b/tests/flatten-2.out @@ -0,0 +1,13 @@ +Hello, I am Edward, the friendly GnuPG bot. I received your message and decrypted it. Here's a copy of your message: + + + +Your signature could not be verified. + +I'm sorry, I was not able to find your public key. Did you remember to attach it? + +- Edward, the friendly GnuPG bot +The Free Software Foundation created me. + +Can you donate to support their work? +https://www.fsf.org/donate diff --git a/tests/gpg-flatten-7.eml b/tests/flatten-3.eml similarity index 100% rename from tests/gpg-flatten-7.eml rename to tests/flatten-3.eml diff --git a/tests/gpg-flatten-7.out b/tests/flatten-3.out similarity index 100% rename from tests/gpg-flatten-7.out rename to tests/flatten-3.out diff --git a/tests/gpg-flatten-8.eml b/tests/flatten-4.eml similarity index 100% rename from tests/gpg-flatten-8.eml rename to tests/flatten-4.eml diff --git a/tests/gpg-flatten-10.out b/tests/flatten-4.out similarity index 100% rename from tests/gpg-flatten-10.out rename to tests/flatten-4.out diff --git a/tests/gpg-flatten-9.eml b/tests/flatten-5.eml similarity index 100% rename from tests/gpg-flatten-9.eml rename to tests/flatten-5.eml diff --git a/tests/gpg-flatten-9.out b/tests/flatten-5.out similarity index 100% rename from tests/gpg-flatten-9.out rename to tests/flatten-5.out diff --git a/tests/gpg-flatten-10.eml b/tests/flatten-6.eml similarity index 100% rename from tests/gpg-flatten-10.eml rename to tests/flatten-6.eml diff --git a/tests/gpg-flatten-8.out b/tests/flatten-6.out similarity index 100% rename from tests/gpg-flatten-8.out rename to tests/flatten-6.out diff --git a/tests/gpg-flatten-11.eml b/tests/flatten-7.eml similarity index 100% rename from tests/gpg-flatten-11.eml rename to tests/flatten-7.eml diff --git a/tests/flatten-7.out b/tests/flatten-7.out new file mode 100644 index 0000000..ec68436 --- /dev/null +++ b/tests/flatten-7.out @@ -0,0 +1,11 @@ + + +Your signature could not be verified. + +I'm sorry, I was not able to find your public key. Did you remember to attach it? + +- Edward, the friendly GnuPG bot +The Free Software Foundation created me. + +Can you donate to support their work? +https://www.fsf.org/donate diff --git a/tests/gpg-flatten-3.eml b/tests/gpg-flatten-3.eml index d6409ee..11fe6fe 100644 --- a/tests/gpg-flatten-3.eml +++ b/tests/gpg-flatten-3.eml @@ -1,23 +1,33 @@ From: No One +MIME-Version: 1.0 To: No One Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= +Content-Type: multipart/encrypted; + protocol="application/pgp-encrypted"; + boundary="x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW" +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156) +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW +Content-Type: application/pgp-encrypted +Content-Description: PGP/MIME version identification -DO YOU READ ME CAPTAIN??!!1 o_O +Version: 1 ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW +Content-Type: application/octet-stream; name="encrypted.asc" +Content-Description: OpenPGP encrypted message +Content-Disposition: inline; filename="encrypted.asc" -hi, i didn't encrypt this part. is that a mistake? +-----BEGIN PGP MESSAGE----- +Version: GnuPG v1 -bye! +owGbwMvMwMS40S5XP8s/7wXjabskhtCNIq9LMjKLFYAoUaEktbhEITe1uDgxPVVP +oTK/VKE4I780J0UhL79EoTg1VQGsNL+0pKC0RI+rYw4LAyMTAxsrE8gUBi5OAZjR +/w2Z/2kxf6n7XqaQ+m96/xz+I86XLqnd65y+W+eg1e5LLfMVTRkOlJ6c/dnwpkOu +heLnxuezYx5w5hdY6XEXzNBgCC5xzstINbyVWxBTl7jknH/XCTvO5mPSB84mnLCO +W+jQYpDzRdOt6i2TxFmek1V+8/8uNzmwf3UI0wI+pe6Eox/sle+f/OXjAQA= +=AT2s +-----END PGP MESSAGE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW-- -iJwEAQECAAYFAlWthWEACgkQsT5tL2pPbuhyWgQApzhIt4EM4FrqCibNI7ZS1V73 -yhml95bw5PXq2fB7wU2I4pkM30T2kpMxdtfHdPXHQSzvuo27IhrUOH7CUtvj0f23 -CllwAGoUmwmdXOLeVvgjwyPzSVAdWLO8/231fS1M8J42v8GV6w78hmq+/Cck2oQE -p4/91AVSikY7bwMrGpU= -=Tavv ------END PGP SIGNATURE----- diff --git a/tests/gpg-flatten-3.out b/tests/gpg-flatten-3.out index ec68436..f5eb59f 100644 --- a/tests/gpg-flatten-3.out +++ b/tests/gpg-flatten-3.out @@ -1,8 +1,6 @@ -Your signature could not be verified. - -I'm sorry, I was not able to find your public key. Did you remember to attach it? +Your signature was verified. - Edward, the friendly GnuPG bot The Free Software Foundation created me. diff --git a/tests/gpg-flatten-4.eml b/tests/gpg-flatten-4.eml index baaca45..ca6e69a 100644 --- a/tests/gpg-flatten-4.eml +++ b/tests/gpg-flatten-4.eml @@ -1,41 +1,43 @@ From: No One -To: No One +MIME-Version: 1.0 +To: No One Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= +Content-Type: multipart/encrypted; + protocol="application/pgp-encrypted"; + boundary="x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW" -DO YOU READ ME CAPTAIN??!!1 o_O +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156) +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW +Content-Type: application/pgp-encrypted +Content-Description: PGP/MIME version identification ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Version: 1 -hi, i didn't encrypt this part. is that a mistake? - -bye! - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iJwEAQECAAYFAlWthWEACgkQsT5tL2pPbuhyWgQApzhIt4EM4FrqCibNI7ZS1V73 -yhml95bw5PXq2fB7wU2I4pkM30T2kpMxdtfHdPXHQSzvuo27IhrUOH7CUtvj0f23 -CllwAGoUmwmdXOLeVvgjwyPzSVAdWLO8/231fS1M8J42v8GV6w78hmq+/Cck2oQE -p4/91AVSikY7bwMrGpU= -=Tavv ------END PGP SIGNATURE----- +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW +Content-Type: application/octet-stream; name="encrypted.asc" +Content-Description: OpenPGP encrypted message +Content-Disposition: inline; filename="encrypted.asc" -----BEGIN PGP MESSAGE----- Version: GnuPG v1 -hIwDWouAYlp2iv8BBADAXsI9Y/miNCVnseKDNZVil3VK3SUbJ4DYoVDVcymcStUw -+bmk3XSk5hqap3CfSKdSvdnxSmaKzYOdpv03kiRtK2gjnakcKxk4pGz85UM5t8ZZ -3estj/Ca40kvSHZAYelgC1W8JshDOyOrS93acfUgJxKQMdxhGRjVAW1YbQWFyNLA -3QEJJeg6obNktEbhXCSlupZFAKJQgdAPDOWYgNeFnTkS4MttM+G0ABx/o8JjeIl5 -wYDucFBDHXSuld9RBzQ1QLOUhB8BOkCq6XFgwaaTKTBT7SQ19n0G8RpZmJ/BX5Ok -msi9nlRm9z6Irjtx9bDudzUfpCzO/YeYBN1J/1o3pw8f/otzOMfRHBStkdo0V9i5 -9JS77QRkSnM4hVrZuvfplYa5iRftdYehLMaMk7k9gOY+B5WEMdgV9ZWRrWOXmqTK -NyB1fIWgKNEqCgZnBFPS6Es6kUXUNnFvsvFMPg5WXx+HBJ3YqhNzsdVegagxjE9F -wi7qHlcHbRGFv7Zz+BsiPQ3M3tQgwBAd1c/d/6CIdZDArvsTZiSdkszpfeziVj2p -ZKhWUBUIpqP59MMlftD19EFTtJm8mpc/gBH074nEwzXdLFKg08Vb5fH2zMRo37w4 -HZzUHFJaj8VMIjQPRXqD6ELclHJbO7ASTyh8S+v9Iv+t4PpJXn8odwAm08bd//e9 -Ch/H9RAlS/22W4KlpZdIvwz7JmwVE9T4Xq1e22Df -=Sn5u +hIwDWouAYlp2iv8BBAC+TPb/Fdoye+wORbVhPNslOQo829IK2nhRYkVcxouDoRQP +M+q6vI0RMqwobFCqsyK6LIutS3JAqHIB7tsl//MN3hHUcIiF4ZgsyPpX+wazLMCp +XFapg0WsuJjnBi5h0ugkpg/B4HuyiPYYIoH1wxCwp449MZzGHLmIMG02JlmiQtLp +AV50UCk6OUoclVbJhpz6vttUxPPihTuVSTHGVJA25S3yF5Z2TTTosA5hwcEEN8/R +fZ/cgYE88ewXcuo9/vYnXnQUGOzbEtFJ9g2wdnEpf0XzKgm60KcZCNXbDfHF9X9X +BrimYlfjjaQ+vL7LEfEinhxZLbdu/yA5ej/colSP7IkefUVOE1J8mW2zmO5vNoRT +mYj0T66+grP7ILPy+T68eY7pWaCoUWNqTQULyAfAyYpEmb6SBw/qtq0ZWVgAuIwM ++sA5vVgKDeb6+Rntesjs7YwIqKzp0LP/u/Dn+jp6D+3njltrkp/zhMUX2PL97CH7 +v9kZbwcxFFqjOvdtFn4bbHa+F1CjS6MakGDG8H609VtdL7vee7goaM9+PUCNYFur +DOsEW0ML8a5gLNFzIScZTxsNwretctsJWu3TkVD+wY1UcqD/h4yIuKF7ZuJOGcW0 +CkxJ6U9OZsFgPzGqpLY3+Q/zb1Z0Tipex0FuKTw6gCpK9gieJKw04ZUFb7MuYPrj +xSCY7ruJiHRz5Vby8a2uQMisjs8ajXtkzinfRRQe7vQd8WJGKBs5pUe+7kLgBhx+ +xI5oHuAQ3SkmdMjhFSQ7idgl+MV+7TVLBx96qdxfUhSw65uW2TySPkBpM1JDxU6A +4hDENnhdBM6/o6JDbClGjVLCN1vgvBAZ8ToOShXOZ1AulZu2sazolhwzvEMzkQyH +gURIeMRulCLM1ufflHaKzDFBOP24gK1Zl+B7g5BDvg== +=Hetx -----END PGP MESSAGE----- +--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW-- + diff --git a/tests/gpg-flatten-4.out b/tests/gpg-flatten-4.out index a8bf99c..3fb2496 100644 --- a/tests/gpg-flatten-4.out +++ b/tests/gpg-flatten-4.out @@ -1,13 +1,20 @@ -Hello, I am Edward, the friendly GnuPG bot. I received your message and decrypted it. Here's a copy of your message: +こんにちは！ 私はGnuPGボットのEdwardです。あなたから送られたメールの暗号を解きました。確認のため、内容を返信します： +> thanks for the message! +> +> > Über Spaß. +> > +> > qual è il suono di una mano sola? +> > +> > こんにちは、お元気ですか？ +> > +> +> test. +> +> -andrew +> +> +- GnuPGボットのEdward -Your signature could not be verified. - -I'm sorry, I was not able to find your public key. Did you remember to attach it? - -- Edward, the friendly GnuPG bot -The Free Software Foundation created me. - -Can you donate to support their work? -https://www.fsf.org/donate +Free Software Foundationが私を制作しました。 Free Software Foundationに寄付しませんか。| https://www.fsf.org/donate diff --git a/tests/gpg-flatten-5.eml b/tests/gpg-flatten-5.eml deleted file mode 100644 index 11fe6fe..0000000 --- a/tests/gpg-flatten-5.eml +++ /dev/null @@ -1,33 +0,0 @@ -From: No One -MIME-Version: 1.0 -To: No One -Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= -Content-Type: multipart/encrypted; - protocol="application/pgp-encrypted"; - boundary="x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW" - -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156) ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW -Content-Type: application/pgp-encrypted -Content-Description: PGP/MIME version identification - -Version: 1 - ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW -Content-Type: application/octet-stream; name="encrypted.asc" -Content-Description: OpenPGP encrypted message -Content-Disposition: inline; filename="encrypted.asc" - ------BEGIN PGP MESSAGE----- -Version: GnuPG v1 - -owGbwMvMwMS40S5XP8s/7wXjabskhtCNIq9LMjKLFYAoUaEktbhEITe1uDgxPVVP -oTK/VKE4I780J0UhL79EoTg1VQGsNL+0pKC0RI+rYw4LAyMTAxsrE8gUBi5OAZjR -/w2Z/2kxf6n7XqaQ+m96/xz+I86XLqnd65y+W+eg1e5LLfMVTRkOlJ6c/dnwpkOu -heLnxuezYx5w5hdY6XEXzNBgCC5xzstINbyVWxBTl7jknH/XCTvO5mPSB84mnLCO -W+jQYpDzRdOt6i2TxFmek1V+8/8uNzmwf3UI0wI+pe6Eox/sle+f/OXjAQA= -=AT2s ------END PGP MESSAGE----- - ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW-- - diff --git a/tests/gpg-flatten-5.out b/tests/gpg-flatten-5.out deleted file mode 100644 index f5eb59f..0000000 --- a/tests/gpg-flatten-5.out +++ /dev/null @@ -1,9 +0,0 @@ - - -Your signature was verified. - -- Edward, the friendly GnuPG bot -The Free Software Foundation created me. - -Can you donate to support their work? -https://www.fsf.org/donate diff --git a/tests/gpg-flatten-6.eml b/tests/gpg-flatten-6.eml deleted file mode 100644 index ca6e69a..0000000 --- a/tests/gpg-flatten-6.eml +++ /dev/null @@ -1,43 +0,0 @@ -From: No One -MIME-Version: 1.0 -To: No One -Subject: =?UTF-8?B?44GT44KT44Gr44Gh44Gv44CB44GK5YWD5rCX44Gn44GZ44GL77yf?= -Content-Type: multipart/encrypted; - protocol="application/pgp-encrypted"; - boundary="x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW" - -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156) ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW -Content-Type: application/pgp-encrypted -Content-Description: PGP/MIME version identification - -Version: 1 - ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW -Content-Type: application/octet-stream; name="encrypted.asc" -Content-Description: OpenPGP encrypted message -Content-Disposition: inline; filename="encrypted.asc" - ------BEGIN PGP MESSAGE----- -Version: GnuPG v1 - -hIwDWouAYlp2iv8BBAC+TPb/Fdoye+wORbVhPNslOQo829IK2nhRYkVcxouDoRQP -M+q6vI0RMqwobFCqsyK6LIutS3JAqHIB7tsl//MN3hHUcIiF4ZgsyPpX+wazLMCp -XFapg0WsuJjnBi5h0ugkpg/B4HuyiPYYIoH1wxCwp449MZzGHLmIMG02JlmiQtLp -AV50UCk6OUoclVbJhpz6vttUxPPihTuVSTHGVJA25S3yF5Z2TTTosA5hwcEEN8/R -fZ/cgYE88ewXcuo9/vYnXnQUGOzbEtFJ9g2wdnEpf0XzKgm60KcZCNXbDfHF9X9X -BrimYlfjjaQ+vL7LEfEinhxZLbdu/yA5ej/colSP7IkefUVOE1J8mW2zmO5vNoRT -mYj0T66+grP7ILPy+T68eY7pWaCoUWNqTQULyAfAyYpEmb6SBw/qtq0ZWVgAuIwM -+sA5vVgKDeb6+Rntesjs7YwIqKzp0LP/u/Dn+jp6D+3njltrkp/zhMUX2PL97CH7 -v9kZbwcxFFqjOvdtFn4bbHa+F1CjS6MakGDG8H609VtdL7vee7goaM9+PUCNYFur -DOsEW0ML8a5gLNFzIScZTxsNwretctsJWu3TkVD+wY1UcqD/h4yIuKF7ZuJOGcW0 -CkxJ6U9OZsFgPzGqpLY3+Q/zb1Z0Tipex0FuKTw6gCpK9gieJKw04ZUFb7MuYPrj -xSCY7ruJiHRz5Vby8a2uQMisjs8ajXtkzinfRRQe7vQd8WJGKBs5pUe+7kLgBhx+ -xI5oHuAQ3SkmdMjhFSQ7idgl+MV+7TVLBx96qdxfUhSw65uW2TySPkBpM1JDxU6A -4hDENnhdBM6/o6JDbClGjVLCN1vgvBAZ8ToOShXOZ1AulZu2sazolhwzvEMzkQyH -gURIeMRulCLM1ufflHaKzDFBOP24gK1Zl+B7g5BDvg== -=Hetx ------END PGP MESSAGE----- - ---x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW-- - diff --git a/tests/gpg-flatten-6.out b/tests/gpg-flatten-6.out deleted file mode 100644 index 3fb2496..0000000 --- a/tests/gpg-flatten-6.out +++ /dev/null @@ -1,20 +0,0 @@ -こんにちは！ 私はGnuPGボットのEdwardです。あなたから送られたメールの暗号を解きました。確認のため、内容を返信します： - -> thanks for the message! -> -> > Über Spaß. -> > -> > qual è il suono di una mano sola? -> > -> > こんにちは、お元気ですか？ -> > -> -> test. -> -> -andrew -> -> - -- GnuPGボットのEdward - -Free Software Foundationが私を制作しました。 Free Software Foundationに寄付しませんか。| https://www.fsf.org/donate -- 2.25.1