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

2 files changed, 11 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
index a8ddd5419..02cb502d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
@@ -59,6 +59,8 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
     // being a little anal about the ArrayList#addAll contract here
     private boolean mergeDupes(ImportKeysListEntry incoming, ImportKeysListEntry existing) {
         boolean modified = false;
+
+        // if any source thinks it’s expired/revoked, it is
         if (incoming.isRevoked()) {
             existing.setRevoked(true);
             modified = true;
@@ -67,8 +69,16 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
             existing.setExpired(true);
             modified = true;
         }
+
+        // we’re going to want to try to fetch the key from everywhere we found it, so remember
+        //  all the origins
         for (String origin : incoming.getOrigins()) {
             existing.addOrigin(origin);
+
+            // to work properly, Keybase-sourced entries need to pass along the extra
+            if (KeybaseKeyserver.ORIGIN.equals(origin)) {
+                existing.setExtraData(incoming.getExtraData());
+            }
         }
         ArrayList<String> incomingIDs = incoming.getUserIds();
         ArrayList<String> existingIDs = existing.getUserIds();
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!");