Merge branch 'master' into yubikey

Conflicts:
	.gitmodules

.gitmodules

@@ -31,9 +31,6 @@
 [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
 [submodule "extern/openpgp-card-nfc-lib"]
 	path = extern/openpgp-card-nfc-lib
-	url = https://github.com/open-keychain/openpgp-card-nfc-lib.git
+	url = https://github.com/open-keychain/openpgp-card-nfc-lib.git

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java

@@ -94,7 +94,7 @@ public class ProviderHelperKeyringTest {
     private static Collection<String> prependResourcePath(Collection<String> files) {
         Collection<String> prependedFiles = new ArrayList<String>();
         for (String file: files) {
-            prependedFiles.add("/extern/OpenPGP-Haskell/tests/data/" + file);
+            prependedFiles.add("/OpenPGP-Haskell/tests/data/" + file);
         }
         return prependedFiles;
     }

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/COPYING

@@ -0,0 +1,13 @@
+Copyright © 2011, Stephen Paul Weber <singpolyma.net>
+
+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.

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 <https://github.com/singpolyma/openpgp>,
+PHP <http://github.com/singpolyma/openpgp-php>,
+and Python <https://github.com/singpolyma/OpenPGP-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
+<http://hackage.haskell.org/package/openpgp-crypto-api> or
+<http://hackage.haskell.org/package/openpgp-Crypto>
+
+For dealing with ASCII armor, see
+<http://hackage.haskell.org/package/openpgp-asciiarmor>
+
+It is intended that you use qualified imports with this library.
+
+> import qualified Data.OpenPGP as OpenPGP

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000002-013.user_id

@@ -0,0 +1 @@
+´$Test Key (RSA) <testkey@example.org>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000019-013.user_id

@@ -0,0 +1 @@
+´$Test Key (DSA) <testkey@example.com>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000030-013.user_id

@@ -0,0 +1 @@
+´+Test Key (DSA sign-only) <test@example.net>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000036-013.user_id

@@ -0,0 +1 @@
+´.Test Key (RSA sign-only) <testkey@example.net>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000048-013.user_id

@@ -0,0 +1 @@
+´$Test Key (RSA) <testkey@example.org>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000057-013.user_id

@@ -0,0 +1 @@
+´$Test Key (DSA) <testkey@example.com>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000066-013.user_id

@@ -0,0 +1 @@
+´+Test Key (DSA sign-only) <test@example.net>

OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/tests/data/000070-013.user_id

@@ -0,0 +1 @@
+´.Test Key (RSA sign-only) <testkey@example.net>

OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell

@@ -1 +0,0 @@
-Subproject commit eba7e4fdce3de6622b4ec3862b405b0acd016377