From 65d2f37324f87a48e5dab47f9e9d98286a0db52c Mon Sep 17 00:00:00 2001 From: Christian Hagau Date: Fri, 19 Jan 2018 00:00:00 +0000 Subject: [PATCH] Allow export of SSH public keys for keyrings with authentication subkey but without the associated private key --- .../keychain/ui/ViewKeyAdvShareFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java index 3d3fb97bf..6ba560914 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java @@ -216,7 +216,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements try { masterKeyId = keyRepository.getCachedPublicKeyRing(mDataUri).extractOrGetMasterKeyId(); CachedPublicKeyRing cachedPublicKeyRing = keyRepository.getCachedPublicKeyRing(masterKeyId); - authSubKeyId = cachedPublicKeyRing.getSecretAuthenticationId(); + authSubKeyId = cachedPublicKeyRing.getAuthenticationId(); } catch (PgpKeyNotFoundException e) { Log.e(Constants.TAG, "key not found!", e); } @@ -232,7 +232,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements String content; long masterKeyId = keyRepository.getCachedPublicKeyRing(mDataUri).extractOrGetMasterKeyId(); if (asSshKey) { - long authSubKeyId = keyRepository.getCachedPublicKeyRing(masterKeyId).getSecretAuthenticationId(); + long authSubKeyId = keyRepository.getCachedPublicKeyRing(masterKeyId).getAuthenticationId(); CanonicalizedPublicKey publicKey = keyRepository.getCanonicalizedPublicKeyRing(masterKeyId) .getPublicKey(authSubKeyId); SshPublicKey sshPublicKey = new SshPublicKey(publicKey);