From 65c3f9806edd694c4db00fa2884139ea97c80962 Mon Sep 17 00:00:00 2001 From: Jan Brands Date: Mon, 6 Dec 2010 21:05:52 +0100 Subject: [PATCH] Corrected MIFARE default key set The all-zero key is not a commonly used key. Fixed naming Change-Id: I2fb86079159195c6893ea758e8b0bbda266dc420 --- core/java/android/nfc/technology/MifareClassic.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/java/android/nfc/technology/MifareClassic.java b/core/java/android/nfc/technology/MifareClassic.java index c25b71f94121e..ba3a42584f88f 100644 --- a/core/java/android/nfc/technology/MifareClassic.java +++ b/core/java/android/nfc/technology/MifareClassic.java @@ -36,23 +36,21 @@ import java.io.IOException; */ public final class MifareClassic extends BasicTagTechnology { /** - * The well-known, default factory MIFARE read key. + * The well-known, default MIFARE read key. * Use this key to effectively make the payload in this sector * public. */ - public static final byte[] DEFAULT_KEY_FACTORY = + public static final byte[] KEY_DEFAULT = {(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF}; - public static final byte[] DEFAULT_KEY_ZERO = - {(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00}; /** * The well-known, default Mifare Application Directory read key. */ - public static final byte[] DEFAULT_KEY_MAD = + public static final byte[] KEY_MIFARE_APPLICATION_DIRECTORY = {(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5}; /** * The well-known, default read key for NDEF data on a Mifare Classic */ - public static final byte[] DEFAULT_KEY_NFC_FORUM = + public static final byte[] KEY_NFC_FORUM = {(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7}; public static final int TYPE_CLASSIC = 0;