diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-04 16:56:44 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-04 16:56:44 +0200 |
commit | 8cf0638f54fc4679c33a0243e17c514271931c48 (patch) | |
tree | 9f4f3f831cf7518014d95f1ab8ea474c5396b237 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java | |
parent | 411b4cfeb2caa1d7d1c33129711bc1cd617778cf (diff) | |
download | open-keychain-8cf0638f54fc4679c33a0243e17c514271931c48.tar.gz open-keychain-8cf0638f54fc4679c33a0243e17c514271931c48.tar.bz2 open-keychain-8cf0638f54fc4679c33a0243e17c514271931c48.zip |
wrapped-key-ring: introduce Uncached*Key objects
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java index 948227819..d1634859a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java @@ -1,6 +1,5 @@ package org.sufficientlysecure.keychain.pgp; -import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPrivateKey; import org.spongycastle.openpgp.PGPPublicKey; @@ -157,7 +156,7 @@ public class CachedSecretKey extends CachedPublicKey { } // get the master subkey (which we certify for) - PGPPublicKey publicKey = publicKeyRing.getSubkey().getKey(); + PGPPublicKey publicKey = publicKeyRing.getSubkey().getPublicKey(); // fetch public key ring, add the certification and return it for (String userId : new IterableIterator<String>(userIds.iterator())) { @@ -175,4 +174,8 @@ public class CachedSecretKey extends CachedPublicKey { // the private key is called without a previous call to unlock() } + public UncachedSecretKey getUncached() { + return new UncachedSecretKey(mSecretKey); + } + } |