diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
| commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
| tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/xml/usb_device_filter.xml | |
| parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
| parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
| download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip | |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/xml/usb_device_filter.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/usb_device_filter.xml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/xml/usb_device_filter.xml b/OpenKeychain/src/main/res/xml/usb_device_filter.xml new file mode 100644 index 000000000..789e4ffb7 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/usb_device_filter.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + Based on https://github.com/Yubico/yubikey-personalization/blob/master/ykcore/ykdef.h + Note that values are decimal. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Yubikey NEO OTP + CCID--> + <usb-device class="11" vendor-id="4176" product-id="273"/> + <!-- Yubikey NEO CCID--> + <usb-device class="11" vendor-id="4176" product-id="274"/> + <!-- Yubikey NEO U2F + CCID--> + <usb-device class="11" vendor-id="4176" product-id="277"/> + <!-- Yubikey NEO OTP + U2F + CCID--> + <usb-device class="11" vendor-id="4176" product-id="278"/> + + + <!-- Yubikey 4 CCID--> + <usb-device class="11" vendor-id="4176" product-id="1028"/> + <!-- Yubikey 4 OTP + CCID--> + <usb-device class="11" vendor-id="4176" product-id="1029"/> + <!-- Yubikey 4 U2F + CCID--> + <usb-device class="11" vendor-id="4176" product-id="1030"/> + <!-- Yubikey 4 OTP + U2F + CCID--> + <usb-device class="11" vendor-id="4176" product-id="1031"/> + +</resources>
\ No newline at end of file |