cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add experimental setting to allow untested usb devices

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-11-22 16:04:25 +01:00
parent 71d2d66ee2
commit 0d099116d5
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@@ -143,6 +143,7 @@ public final class Constants {
public static final String EXPERIMENTAL_ENABLE_WORD_CONFIRM = "experimentalEnableWordConfirm"; public static final String EXPERIMENTAL_ENABLE_WORD_CONFIRM = "experimentalEnableWordConfirm";
public static final String EXPERIMENTAL_ENABLE_LINKED_IDENTITIES = "experimentalEnableLinkedIdentities"; public static final String EXPERIMENTAL_ENABLE_LINKED_IDENTITIES = "experimentalEnableLinkedIdentities";
public static final String EXPERIMENTAL_ENABLE_KEYBASE = "experimentalEnableKeybase"; public static final String EXPERIMENTAL_ENABLE_KEYBASE = "experimentalEnableKeybase";
public static final String EXPERIMENTAL_USB_ALLOW_UNTESTED = "experimentalUsbAllowUntested";
public static final String EXPERIMENTAL_SMARTPGP_VERIFY_AUTHORITY = "smartpgp_authorities_pref"; public static final String EXPERIMENTAL_SMARTPGP_VERIFY_AUTHORITY = "smartpgp_authorities_pref";
public static final String EXPERIMENTAL_SMARTPGP_AUTHORITIES = "smartpgp_authorities"; public static final String EXPERIMENTAL_SMARTPGP_AUTHORITIES = "smartpgp_authorities";

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
View File

@@ -1016,10 +1016,9 @@ public class SecurityTokenConnection {
TransportType transportType = mTransport.getTransportType(); TransportType transportType = mTransport.getTransportType();
SecurityTokenInfo info = SecurityTokenInfo return SecurityTokenInfo
.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], hasLifeCycleManagement); .create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6],
hasLifeCycleManagement);
return info;
} }
public static double parseOpenPgpVersion(final byte[] aid) { public static double parseOpenPgpVersion(final byte[] aid) {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@@ -402,6 +402,10 @@ public class Preferences {
return mSharedPreferences.getBoolean(Pref.EXPERIMENTAL_ENABLE_KEYBASE, false); return mSharedPreferences.getBoolean(Pref.EXPERIMENTAL_ENABLE_KEYBASE, false);
} }
public boolean getExperimentalUsbAllowUntested() {
return mSharedPreferences.getBoolean(Pref.EXPERIMENTAL_USB_ALLOW_UNTESTED, false);
}
public boolean getExperimentalSmartPGPAuthoritiesEnable() { public boolean getExperimentalSmartPGPAuthoritiesEnable() {
return mSharedPreferences.getBoolean(Pref.EXPERIMENTAL_SMARTPGP_VERIFY_AUTHORITY, false); return mSharedPreferences.getBoolean(Pref.EXPERIMENTAL_SMARTPGP_VERIFY_AUTHORITY, false);
} }

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1982,5 +1982,7 @@
</plurals> </plurals>
<string name="button_locate_nfc">"Where is my NFC reader?"</string> <string name="button_locate_nfc">"Where is my NFC reader?"</string>
<string name="label_usb_untested_summary">If enabled, USB Smartcard readers can be used that have not been properly tested.</string>
<string name="label_usb_untested">Allow untested USB Devices</string>
</resources> </resources>

8
OpenKeychain/src/main/res/xml/experimental_preferences.xml
View File

@@ -35,6 +35,14 @@
android:persistent="true" android:persistent="true"
android:title="@string/label_theme" /> android:title="@string/label_theme" />
<SwitchPreference
android:defaultValue="false"
android:key="experimentalUsbAllowUntested"
android:persistent="true"
android:summary="@string/label_usb_untested_summary"
android:title="@string/label_usb_untested" />
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="smartpgp_authorities_pref" android:key="smartpgp_authorities_pref"