moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

Don't allow certification using keys where primary subkey is stripped

Browse Source 
Closes #596
This commit is contained in:
Vincent Breitmoser 2014-05-07 22:41:09 +02:00
parent b4a9d1a2db
commit 346b5dbb28
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
View File

@ -56,7 +56,7 @@ public class SelectSecretKeyFragment extends ListFragment implements
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putBoolean(ARG_FILTER_CERTIFY, filterCertify); args.putBoolean(ARG_FILTER_CERTIFY, filterCertify);
args.putBoolean(ARG_FILTER_CERTIFY, filterSign); args.putBoolean(ARG_FILTER_SIGN, filterSign);
frag.setArguments(args); frag.setArguments(args);
return frag; return frag;
@ -124,7 +124,8 @@ public class SelectSecretKeyFragment extends ListFragment implements
KeyRings.CAN_CERTIFY, KeyRings.CAN_CERTIFY,
// has sign may be any subkey // has sign may be any subkey
KeyRings.HAS_SIGN, KeyRings.HAS_SIGN,
KeyRings.HAS_ANY_SECRET KeyRings.HAS_ANY_SECRET,
KeyRings.HAS_SECRET
}; };
String where = KeyRings.HAS_ANY_SECRET + " = 1"; String where = KeyRings.HAS_ANY_SECRET + " = 1";
@ -158,7 +159,7 @@ public class SelectSecretKeyFragment extends ListFragment implements
private class SelectSecretKeyCursorAdapter extends SelectKeyCursorAdapter { private class SelectSecretKeyCursorAdapter extends SelectKeyCursorAdapter {
private int mIndexHasSign, mIndexCanCertify; private int mIndexHasSign, mIndexCanCertify, mIndexHasSecret;
public SelectSecretKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView) { public SelectSecretKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView) {
super(context, c, flags, listView); super(context, c, flags, listView);
@ -170,6 +171,7 @@ public class SelectSecretKeyFragment extends ListFragment implements
if (cursor != null) { if (cursor != null) {
mIndexCanCertify = cursor.getColumnIndexOrThrow(KeyRings.CAN_CERTIFY); mIndexCanCertify = cursor.getColumnIndexOrThrow(KeyRings.CAN_CERTIFY);
mIndexHasSign = cursor.getColumnIndexOrThrow(KeyRings.HAS_SIGN); mIndexHasSign = cursor.getColumnIndexOrThrow(KeyRings.HAS_SIGN);
mIndexHasSecret = cursor.getColumnIndexOrThrow(KeyRings.HAS_SECRET);
} }
} }
@ -187,7 +189,8 @@ public class SelectSecretKeyFragment extends ListFragment implements
// Check if key is viable for our purposes (certify or sign) // Check if key is viable for our purposes (certify or sign)
if(mFilterCertify) { if(mFilterCertify) {
// Only enable if can certify // Only enable if can certify
if (cursor.getInt(mIndexCanCertify) == 0) { if (cursor.getInt(mIndexCanCertify) == 0
|| cursor.getInt(mIndexHasSecret) == 0) {
h.status.setText(R.string.can_certify_not); h.status.setText(R.string.can_certify_not);
} else { } else {
h.status.setText(R.string.can_certify); h.status.setText(R.string.can_certify);