aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-27 13:52:05 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-27 13:52:05 +0200
commitf22bbbd96cba818ac01ad7b7c472bfe29c31fff4 (patch)
tree38ff2e52006aff875cb1a72de5643ddf25cc0468 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
parent1a7edc992588b16f96a185112e80304d6252f451 (diff)
parent1a2ec1eb328cf8aa828232a1cf66294b8a0fc77b (diff)
downloadopen-keychain-f22bbbd96cba818ac01ad7b7c472bfe29c31fff4.tar.gz
open-keychain-f22bbbd96cba818ac01ad7b7c472bfe29c31fff4.tar.bz2
open-keychain-f22bbbd96cba818ac01ad7b7c472bfe29c31fff4.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
index fb2209d3e..7aa09e801 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
@@ -208,7 +208,7 @@ public class NfcActivity extends ActionBarActivity {
+ "20" // INS
+ "00" // P1
+ "82" // P2 (PW1)
- + String.format("%02d", mPin.length()) // Lc
+ + String.format("%02x", mPin.length()) // Lc
+ Hex.toHexString(mPin.getBytes());
if ( ! card(login).equals(accepted)) { // login
toast("Wrong PIN!");