From 3d74a9c11c6eea3cb038a1ea90478ebd992b7e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 18 Jul 2014 09:34:54 +0200 Subject: Add OpenPGP-Haskell test files directly --- .../keychain/tests/ProviderHelperKeyringTest.java | 2 +- .../src/test/resources/OpenPGP-Haskell/COPYING | 13 +++++++++++ .../src/test/resources/OpenPGP-Haskell/README | 26 +++++++++++++++++++++ .../tests/data/000001-006.public_key | Bin 0 -> 171 bytes .../OpenPGP-Haskell/tests/data/000002-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000003-002.sig | Bin 0 -> 113 bytes .../tests/data/000004-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000005-002.sig | Bin 0 -> 113 bytes .../tests/data/000006-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000007-002.sig | Bin 0 -> 220 bytes .../tests/data/000008-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000009-002.sig | Bin 0 -> 158 bytes .../tests/data/000010-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000011-002.sig | Bin 0 -> 96 bytes .../tests/data/000012-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000013-014.public_subkey | Bin 0 -> 171 bytes .../OpenPGP-Haskell/tests/data/000014-002.sig | Bin 0 -> 195 bytes .../tests/data/000015-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000016-006.public_key | Bin 0 -> 1201 bytes .../OpenPGP-Haskell/tests/data/000017-002.sig | Bin 0 -> 123 bytes .../tests/data/000018-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000019-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000020-002.sig | Bin 0 -> 130 bytes .../tests/data/000021-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000022-002.sig | Bin 0 -> 186 bytes .../tests/data/000023-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000024-014.public_subkey | Bin 0 -> 608 bytes .../OpenPGP-Haskell/tests/data/000025-002.sig | Bin 0 -> 105 bytes .../tests/data/000026-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000027-006.public_key | Bin 0 -> 421 bytes .../OpenPGP-Haskell/tests/data/000028-002.sig | Bin 0 -> 99 bytes .../tests/data/000029-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000030-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000031-002.sig | Bin 0 -> 132 bytes .../tests/data/000032-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000033-002.sig | Bin 0 -> 96 bytes .../tests/data/000034-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000035-006.public_key | Bin 0 -> 143 bytes .../OpenPGP-Haskell/tests/data/000036-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000037-002.sig | Bin 0 -> 192 bytes .../tests/data/000038-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000039-002.sig | Bin 0 -> 72 bytes .../tests/data/000040-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000041-017.attribute | Bin 0 -> 1761 bytes .../OpenPGP-Haskell/tests/data/000042-002.sig | Bin 0 -> 192 bytes .../tests/data/000043-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000044-014.public_subkey | Bin 0 -> 272 bytes .../OpenPGP-Haskell/tests/data/000045-002.sig | Bin 0 -> 161 bytes .../tests/data/000046-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000047-005.secret_key | Bin 0 -> 610 bytes .../OpenPGP-Haskell/tests/data/000048-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000049-002.sig | Bin 0 -> 220 bytes .../tests/data/000050-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000051-007.secret_subkey | Bin 0 -> 611 bytes .../OpenPGP-Haskell/tests/data/000052-002.sig | Bin 0 -> 195 bytes .../tests/data/000053-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000054-005.secret_key | Bin 0 -> 1275 bytes .../OpenPGP-Haskell/tests/data/000055-002.sig | Bin 0 -> 123 bytes .../tests/data/000056-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000057-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000058-002.sig | Bin 0 -> 130 bytes .../tests/data/000059-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000060-007.secret_subkey | Bin 0 -> 698 bytes .../OpenPGP-Haskell/tests/data/000061-002.sig | Bin 0 -> 104 bytes .../tests/data/000062-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000063-005.secret_key | Bin 0 -> 484 bytes .../OpenPGP-Haskell/tests/data/000064-002.sig | Bin 0 -> 99 bytes .../tests/data/000065-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/000066-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000067-002.sig | Bin 0 -> 106 bytes .../tests/data/000068-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000069-005.secret_key | Bin 0 -> 513 bytes .../OpenPGP-Haskell/tests/data/000070-013.user_id | 1 + .../OpenPGP-Haskell/tests/data/000071-002.sig | Bin 0 -> 192 bytes .../tests/data/000072-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000073-017.attribute | Bin 0 -> 1761 bytes .../OpenPGP-Haskell/tests/data/000074-002.sig | Bin 0 -> 192 bytes .../tests/data/000075-012.ring_trust | Bin 0 -> 4 bytes .../tests/data/000076-007.secret_subkey | Bin 0 -> 961 bytes .../OpenPGP-Haskell/tests/data/000077-002.sig | Bin 0 -> 161 bytes .../tests/data/000078-012.ring_trust | Bin 0 -> 4 bytes .../OpenPGP-Haskell/tests/data/002182-002.sig | Bin 0 -> 363 bytes .../tests/data/3F5BBA0B0694BEB6000005-002.sig | Bin 0 -> 1089 bytes .../tests/data/3F5BBA0B0694BEB6000017-002.sig | Bin 0 -> 1089 bytes .../tests/data/compressedsig-bzip2.gpg | Bin 0 -> 442 bytes .../tests/data/compressedsig-zlib.gpg | Bin 0 -> 322 bytes .../OpenPGP-Haskell/tests/data/compressedsig.gpg | Bin 0 -> 324 bytes .../OpenPGP-Haskell/tests/data/onepass_sig | Bin 0 -> 15 bytes .../OpenPGP-Haskell/tests/data/pubring.gpg | Bin 0 -> 179272 bytes .../OpenPGP-Haskell/tests/data/secring.gpg | Bin 0 -> 9329 bytes .../tests/data/symmetrically_encrypted | Bin 0 -> 528 bytes .../tests/data/uncompressed-ops-dsa-sha384.txt.gpg | Bin 0 -> 150 bytes .../tests/data/uncompressed-ops-dsa.gpg | Bin 0 -> 150 bytes .../tests/data/uncompressed-ops-rsa.gpg | Bin 0 -> 236 bytes extern/openpgp-api-lib | 2 +- 95 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg create mode 100644 OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java index ab5c1f1ec..665e8ef2b 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java @@ -94,7 +94,7 @@ public class ProviderHelperKeyringTest { private static Collection prependResourcePath(Collection files) { Collection prependedFiles = new ArrayList(); for (String file: files) { - prependedFiles.add("/extern/OpenPGP-Haskell/tests/data/" + file); + prependedFiles.add("/OpenPGP-Haskell/tests/data/" + file); } return prependedFiles; } diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING new file mode 100644 index 000000000..55234e7a0 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING @@ -0,0 +1,13 @@ +Copyright © 2011, Stephen Paul Weber + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README new file mode 100644 index 000000000..cff696c83 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README @@ -0,0 +1,26 @@ +These test files were copied from the OpenPGP Haskell project. + + + +Original README +=============== + +This is an OpenPGP library inspired by my work on OpenPGP libraries in +Ruby , +PHP , +and Python . + +It defines types to represent OpenPGP messages as a series of packets +and then defines instances of Data.Binary for each to facilitate +encoding/decoding. + +For performing cryptography, see + or + + +For dealing with ASCII armor, see + + +It is intended that you use qualified imports with this library. + +> import qualified Data.OpenPGP as OpenPGP diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key new file mode 100644 index 000000000..7cbab1782 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000001-006.public_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id new file mode 100644 index 000000000..759449bb4 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id @@ -0,0 +1 @@ +´$Test Key (RSA) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig new file mode 100644 index 000000000..1e0656d27 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000003-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000004-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig new file mode 100644 index 000000000..108b99842 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000005-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000006-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig new file mode 100644 index 000000000..14276d0a5 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000007-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000008-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig new file mode 100644 index 000000000..4a282dd68 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000009-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000010-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig new file mode 100644 index 000000000..cae1b7391 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000011-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000012-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey new file mode 100644 index 000000000..08676d067 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000013-014.public_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig new file mode 100644 index 000000000..dd601807f Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000014-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000015-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key new file mode 100644 index 000000000..c9dccbf1e Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000016-006.public_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig new file mode 100644 index 000000000..e734505a7 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000017-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000018-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id new file mode 100644 index 000000000..ab3f51d91 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id @@ -0,0 +1 @@ +´$Test Key (DSA) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig new file mode 100644 index 000000000..8588489a7 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000020-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000021-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig new file mode 100644 index 000000000..fefcb5fea Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000022-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000023-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey new file mode 100644 index 000000000..2e8deea28 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000024-014.public_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig new file mode 100644 index 000000000..a3eea0a20 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000025-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000026-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key new file mode 100644 index 000000000..5817e0037 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000027-006.public_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig new file mode 100644 index 000000000..5194b7840 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000028-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000029-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id new file mode 100644 index 000000000..fb3f49e0d --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id @@ -0,0 +1 @@ +´+Test Key (DSA sign-only) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig new file mode 100644 index 000000000..f69f6875b Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000031-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000032-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig new file mode 100644 index 000000000..2bb55d4fe Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000033-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000034-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key new file mode 100644 index 000000000..5980638c4 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000035-006.public_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id new file mode 100644 index 000000000..5d0d46e5d --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id @@ -0,0 +1 @@ +´.Test Key (RSA sign-only) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig new file mode 100644 index 000000000..833b563b2 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000037-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000038-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig new file mode 100644 index 000000000..89c34fa5d Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000039-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000040-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute new file mode 100644 index 000000000..a21a82fb1 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000041-017.attribute differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig new file mode 100644 index 000000000..fc6267fd0 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000042-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000043-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey new file mode 100644 index 000000000..06bf50e4f Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000044-014.public_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig new file mode 100644 index 000000000..336eb0f24 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000045-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust new file mode 100644 index 000000000..ffa57e57a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000046-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key new file mode 100644 index 000000000..77b5d428a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000047-005.secret_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id new file mode 100644 index 000000000..759449bb4 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id @@ -0,0 +1 @@ +´$Test Key (RSA) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig new file mode 100644 index 000000000..14276d0a5 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000049-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000050-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey new file mode 100644 index 000000000..b4e65c92f Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000051-007.secret_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig new file mode 100644 index 000000000..dd601807f Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000052-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000053-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key new file mode 100644 index 000000000..f153e5932 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000054-005.secret_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig new file mode 100644 index 000000000..e734505a7 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000055-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000056-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id new file mode 100644 index 000000000..ab3f51d91 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id @@ -0,0 +1 @@ +´$Test Key (DSA) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig new file mode 100644 index 000000000..8588489a7 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000058-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000059-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey new file mode 100644 index 000000000..9df45f395 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000060-007.secret_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig new file mode 100644 index 000000000..639494223 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000061-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000062-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key new file mode 100644 index 000000000..2f4268ee1 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000063-005.secret_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig new file mode 100644 index 000000000..5194b7840 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000064-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000065-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id new file mode 100644 index 000000000..fb3f49e0d --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id @@ -0,0 +1 @@ +´+Test Key (DSA sign-only) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig new file mode 100644 index 000000000..d354e79df Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000067-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000068-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key new file mode 100644 index 000000000..17a2c354d Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000069-005.secret_key differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id new file mode 100644 index 000000000..5d0d46e5d --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id @@ -0,0 +1 @@ +´.Test Key (RSA sign-only) \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig new file mode 100644 index 000000000..833b563b2 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000071-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000072-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute new file mode 100644 index 000000000..a21a82fb1 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000073-017.attribute differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig new file mode 100644 index 000000000..fc6267fd0 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000074-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000075-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey new file mode 100644 index 000000000..b380339a4 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000076-007.secret_subkey differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig new file mode 100644 index 000000000..336eb0f24 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000077-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust new file mode 100644 index 000000000..b1eeabb95 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000078-012.ring_trust differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig new file mode 100644 index 000000000..2bc6679f4 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/002182-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig new file mode 100644 index 000000000..94055af66 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000005-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig new file mode 100644 index 000000000..b22f23b91 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/3F5BBA0B0694BEB6000017-002.sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg new file mode 100644 index 000000000..87539dbe8 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-bzip2.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg new file mode 100644 index 000000000..4da4dfa99 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig-zlib.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg new file mode 100644 index 000000000..dd617de13 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/compressedsig.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig new file mode 100644 index 000000000..87b2895ea Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/onepass_sig differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg new file mode 100644 index 000000000..a1519ee74 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/pubring.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg new file mode 100644 index 000000000..13598756a Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/secring.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted new file mode 100644 index 000000000..129155aa2 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/symmetrically_encrypted differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg new file mode 100644 index 000000000..39828fcae Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa-sha384.txt.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg new file mode 100644 index 000000000..97e7a267b Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-dsa.gpg differ diff --git a/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg new file mode 100644 index 000000000..7ae453da6 Binary files /dev/null and b/OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/uncompressed-ops-rsa.gpg differ diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index aa9ecf871..cd1a6748d 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit aa9ecf871ce4db462034662675b258f9839d3f61 +Subproject commit cd1a6748dd7a4c7a251a4f75eb289955dfbb1058 -- cgit v1.2.3 From 306bea5ee95576cd5428fe9ab9289fe428a86c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 18 Jul 2014 09:39:36 +0200 Subject: Removed OpenPGP-haskell submodule --- .gitmodules | 5 +---- OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell diff --git a/.gitmodules b/.gitmodules index 956362d4b..687126e37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,4 @@ url = https://github.com/open-keychain/KeybaseLib.git [submodule "extern/minidns"] path = extern/minidns - url = https://github.com/open-keychain/minidns.git -[submodule "OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell"] - path = OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell - url = https://github.com/singpolyma/OpenPGP-Haskell.git + url = https://github.com/open-keychain/minidns.git \ No newline at end of file diff --git a/OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell b/OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell deleted file mode 160000 index eba7e4fdc..000000000 --- a/OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eba7e4fdce3de6622b4ec3862b405b0acd016377 -- cgit v1.2.3