aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-21 22:18:58 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-21 22:18:58 +0100
commit04c7639a5a9b4f85122b7d5f299ba09131ce3036 (patch)
treefc4bf4afbca231d107b445487572d24165d2d455 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java
parent1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 (diff)
downloadopen-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.tar.gz
open-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.tar.bz2
open-keychain-04c7639a5a9b4f85122b7d5f299ba09131ce3036.zip
split up wait/action yubikey fragments
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java
index c2506685d..fa5b0785e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKeyRing.java
@@ -97,10 +97,12 @@ public class CanonicalizedPublicKeyRing extends CanonicalizedKeyRing {
}
/** Create a dummy secret ring from this key */
- public UncachedKeyRing createDummySecretRing () {
+ public UncachedKeyRing createDummySecretRing (boolean divertToCard) {
PGPSecretKeyRing secRing = PGPSecretKeyRing.constructDummyFromPublic(getRing(),
- S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY);
+ divertToCard
+ ? S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD
+ : S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY);
return new UncachedKeyRing(secRing);
}