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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2017-10-23 14:49:00 +02:00
parent 96d856f2e6 476f756607
commit e18ca42789
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
View File

@@ -192,7 +192,7 @@ public class GithubResource extends LinkedTokenResource {
return null;
}
Pattern p = Pattern.compile("https://gist\\.github\\.com/([a-zA-Z0-9_]+)/([0-9a-f]+)");
Pattern p = Pattern.compile("https://gist\\.github\\.com/([a-zA-Z0-9_-]+)/([0-9a-f]+)");
Matcher match = p.matcher(uri.toString());
if (!match.matches()) {
return null;

44
OpenKeychain/src/main/res/xml/usb_device_filter.xml
View File

@@ -8,35 +8,35 @@
Note that values are decimal.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Yubikey NEO OTP + CCID-->
<!-- Yubikey NEO OTP + CCID -->
<usb-device class="11" vendor-id="4176" product-id="273"/>
<!-- Yubikey NEO CCID-->
<!-- Yubikey NEO CCID -->
<usb-device class="11" vendor-id="4176" product-id="274"/>
<!-- Yubikey NEO U2F + CCID-->
<!-- Yubikey NEO U2F + CCID -->
<usb-device class="11" vendor-id="4176" product-id="277"/>
<!-- Yubikey NEO OTP + U2F + CCID-->
<!-- 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"/>
<!-- Nitrokey Pro-->
<!-- Nitrokey Pro -->
<usb-device class="11" vendor-id="8352" product-id="16648"/>
<!-- Nitrokey Storage-->
<usb-device class="11" vendor-id="8352" product-id="16649"/>
<!--GNUK based device are not supported right now-->
<!-- Nitrokey Start-->
<!-- 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"/>-->
<!-- Nitrokey Storage -->
<!--<usb-device class="11" vendor-id="8352" product-id="16649"/>-->
<!-- Nitrokey Start -->
<!--<usb-device class="11" vendor-id="8352" product-id="16913"/>-->
<!-- Default GNUK vid/pid-->
<!-- Default GNUK vid/pid -->
<!--<usb-device class="11" vendor-id="9035" product-id="0"/>-->
<!-- Ledger Nano S -->
<!--<usb-device class="11" vendor-id="11415" product-id="1"/>-->
</resources>