diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 01:09:46 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 01:09:46 +0200 |
| commit | 305900799546da6b45e327c3480975c860af84e1 (patch) | |
| tree | 774951fc4956157081377d57cbe1304dbebb123a | |
| parent | 97baa0e52f1830c98f68de69e8d07e3c04527088 (diff) | |
| parent | 108b35cb50d3074e02812e2b333779466a1bf824 (diff) | |
| download | open-keychain-305900799546da6b45e327c3480975c860af84e1.tar.gz open-keychain-305900799546da6b45e327c3480975c860af84e1.tar.bz2 open-keychain-305900799546da6b45e327c3480975c860af84e1.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java index 8e72b3c35..e4a1d62ae 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java @@ -79,7 +79,10 @@ public class ProviderHelperSaveTest { @Test public void testImportSymantec() throws Exception { - // insert two keys with same long key id, make sure the second one gets rejected either way! + // symantec pgp desktop exports secret keys without self certificates. we don't support + // those on their own, but if they are imported together with their public key (or if + // the public key is already known), the self certs info will be merged in as a special + // case. UncachedKeyRing seckey = readRingFromResource("/test-keys/symantec_secret.asc"); UncachedKeyRing pubkey = |