diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 01:32:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 01:32:36 +0200 |
| commit | 3759d74ac857ee434ec7b0f8c5dd0b371c621a93 (patch) | |
| tree | d8b6ee0e58ad1063e2742fcdf33df870869a13c6 /OpenKeychain | |
| parent | 862c9a8b3ccaadcc712b288b19db49fd5afd533a (diff) | |
| download | open-keychain-3759d74ac857ee434ec7b0f8c5dd0b371c621a93.tar.gz open-keychain-3759d74ac857ee434ec7b0f8c5dd0b371c621a93.tar.bz2 open-keychain-3759d74ac857ee434ec7b0f8c5dd0b371c621a93.zip | |
add test case for duplicate keys in keyring (#870)
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java index bf28465f5..4106ab73d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java @@ -329,9 +329,9 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey { return new UncachedSecretKey(mSecretKey); } - // HACK - public PGPSecretKey getSecretKey() { - return mSecretKey; + // HACK, for TESTING ONLY!! + PGPPrivateKey getPrivateKey () { + return mPrivateKey; } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 0a8774029..c4070e39a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -1118,7 +1118,7 @@ public class PgpKeyOperation { pKey, flags, expiry); } - private static PGPSignature generateSubkeyBindingSignature( + static PGPSignature generateSubkeyBindingSignature( PGPPublicKey masterPublicKey, PGPPrivateKey masterPrivateKey, PGPPrivateKey subPrivateKey, PGPPublicKey pKey, int flags, long expiry) throws IOException, PGPException, SignatureException { |