updated the test files and added another gpg key

so everyone is capable of running the tests

diff --git a/tests/gpg-flatten-1.eml b/tests/gpg-flatten-1.eml
index 7dc9339abeb97861be4bd7bc8e75dad5c826e9f6..b2e98852d319c962b4248c02b641cdad025a08c2 100644 (file)
--- a/tests/gpg-flatten-1.eml
+++ b/tests/gpg-flatten-1.eml
@@ -21,22 +21,22 @@ Content-Disposition: inline; filename="encrypted.asc"
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1
 
-hIwDWouAYlp2iv8BA/sEjt5WzTB5XjR1ya3gb9q2bAhyn/KqxTX12K6/ZgiyVwO4
-1MW8MaVx1l9+RTeWj1mWYo7snTGsKYvUjnrFaL25LghxTcqiiIgrQbXS+94nbmmJ
-l5XUOND4Z9sLutWZ12edAZCPXONuvsRpjKbJ0COo2xT8dRG/nYPch5l+iQbW9tLp
-AYA+g74i8gOOvGubE9EAtcTCODfH/ZOeDfwBZx0DzyhJ8/WkDcgSTUX5O64o53z9
-ps4jcyw2usX74iNNiBvFsYLlFe3ouHnPgXidLCmuHGKm+NYSe2IHFaBNuMn9sjzm
-nkzuN5DxC5bnm4VsAY4hqh3JBlU9KhYse8z2JANNqe3ykF350mC5HZ7vldtiYzyI
-gAOJjkisIclt4W7S+zNXlAe+wtDjRadWAjLB1NO41ByBSqOTXo2HnLIE/wjZYAcO
-+6AcCykXcnpgPbcpWxtmStVrUdCOhHJHyHxZaOtmym0+5ZxwEx3ZTNZI01LNUJ72
-6WGgEA7VnwYZpIONWpHiFE5R4nn/C/O465R60EM9V8rS7JyVNP/YBRVVVl1EyjDZ
-scOoTiV3dX1+42Mhhn7CrwrgADSID00gPrYWRiVjJZFfDIJoKShk4LxhoKCwiNr3
-lTFGV37BBQvAi5Ff38IhDF9maHlq1zNWYicQ1gt4IiWPToXCwEkAPvuBJngBoD7v
-y+BdGLSHDBM0aaM9XrUdIjp2JGDMkDu0omXluXDsy5arhdOPDz7DlKcRiNvdYc1P
-oR+Efnj6REgGXX7H/xwmD9+ZK2PBFMUMOOMV39o+SyP+10CV4OCD6B9vzYw0tCTK
-zzB1haHF1oHT2ywgtgM6eFeuc1XBbuEGTOToEC8VDuAug38k0ucFWdQHg++qzYnb
-K5sKzzl40UDdLDIU1bD3VIkqAufAr886CAvKDzGseA==
-=FfqK
+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-2.eml b/tests/gpg-flatten-2.eml
new file mode 100644 (file)
index 0000000..e36b944
--- /dev/null
+++ b/tests/gpg-flatten-2.eml
@@ -0,0 +1,62 @@
+From: No One <noone@localhost>
+MIME-Version: 1.0
+To: No One <noone@localhost>
+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
+
+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
+SUve2ekiMrBQcLVCc+o382L92duWnQ==
+=6z2c
+-----END PGP MESSAGE-----
+
+--x2iAciceo0NrKsl4uFVFGTgJ6k0ocg8FW--
+

diff --git a/tests/gpg-flatten-2.out b/tests/gpg-flatten-2.out
new file mode 100644 (file)
index 0000000..1e69340
--- /dev/null
+++ b/tests/gpg-flatten-2.out
@@ -0,0 +1,19 @@
+thanks for the message!
+
+
+> thanks for the message!
+> 
+> > Über Spaß.
+> >
+> > qual è il suono di una mano sola?
+> >
+> > こんにちは、お元気ですか？
+> >
+> 
+> test.
+> 
+> -andrew
+> 
+> 
+> 
+> 

diff --git a/tests/testgnupghome/pubring.gpg b/tests/testgnupghome/pubring.gpg
index f455159cf96a1d0addd109dff1961d18d288ae82..f60d11609cac693d09638c5ac6454792b395aba4 100644 (file)
Binary files a/tests/testgnupghome/pubring.gpg and b/tests/testgnupghome/pubring.gpg differ

diff --git a/tests/testgnupghome/secring.gpg b/tests/testgnupghome/secring.gpg
index 49e02da94329ebdebbaead4ff52bb9e901cd29fb..0deb8b74e552bc8b9b5834255b750330d044f368 100644 (file)
Binary files a/tests/testgnupghome/secring.gpg and b/tests/testgnupghome/secring.gpg differ

diff --git a/tests/testgnupghome/trustdb.gpg b/tests/testgnupghome/trustdb.gpg
index 35137131caa2b5a2968dc6e2f9faf9458a61474e..c42c86b4011299320db4845f2e01b19f0728a80b 100644 (file)
Binary files a/tests/testgnupghome/trustdb.gpg and b/tests/testgnupghome/trustdb.gpg differ