Skip to content

Export PlaintextKeys from gptool module #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
igarshep wants to merge 2 commits into from
Closed

Export PlaintextKeys from gptool module #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e30249c
make PlaintextKeys accessible
igarshep Apr 1, 2025
8851996
kdf_template private with getter
igarshep Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tool/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
requires org.bouncycastle.provider;
requires org.bouncycastle.pkix;
requires org.slf4j;
exports pro.javacard.gptool.key;
}
5 changes: 3 additions & 2 deletions tool/src/main/java/pro/javacard/gptool/GPTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import pro.javacard.gp.*;
import pro.javacard.gp.GPRegistryEntry.Privilege;
import pro.javacard.gp.GPSession.APDUMode;
import pro.javacard.gptool.key.PlaintextKeys;
import pro.javacard.pace.AESSecureChannel;
import pro.javacard.pace.PACE;
import pro.javacard.pace.PACEException;
Expand Down Expand Up @@ -847,8 +848,8 @@ else if (keyver >= 0x30 && keyver <= 0x3F)
PlaintextKeys pk = (PlaintextKeys) newKeys;
if (pk.getMasterKey().isPresent())
System.out.println(gp.getAID() + " locked with: " + HexUtils.bin2hex(pk.getMasterKey().get()));
if (pk.kdf_template != null)
System.out.println("Keys were diversified with " + pk.kdf_template + " and " + HexUtils.bin2hex(kdd));
if (pk.getDiversifier() != null)
System.out.println("Keys were diversified with " + pk.getDiversifier() + " and " + HexUtils.bin2hex(kdd));
System.out.println("Write this down, DO NOT FORGET/LOSE IT!");
} else {
System.out.println("Card locked with new keys.");
Expand Down
1 change: 1 addition & 0 deletions tool/src/main/java/pro/javacard/gptool/PlaintextKeysProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.google.auto.service.AutoService;
import pro.javacard.gp.CardKeysProvider;
import pro.javacard.gp.GPCardKeys;
import pro.javacard.gptool.key.PlaintextKeys;

import java.util.Map;
import java.util.Optional;
Expand Down
12 changes: 8 additions & 4 deletions ...va/pro/javacard/gptool/PlaintextKeys.java → ...ro/javacard/gptool/key/PlaintextKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package pro.javacard.gptool;
package pro.javacard.gptool.key;

import apdu4j.core.HexUtils;
import org.slf4j.Logger;
Expand All @@ -33,11 +33,11 @@

// Handles plaintext card keys.
// Supports diversification of card keys with a few known algorithms.
class PlaintextKeys extends GPCardKeys {
public class PlaintextKeys extends GPCardKeys {
private static final Logger logger = LoggerFactory.getLogger(PlaintextKeys.class);

// After diversify() we know for which protocol we have keys for, unless known before
static final byte[] defaultKeyBytes = HexUtils.hex2bin("404142434445464748494A4B4C4D4E4F");
public static final byte[] defaultKeyBytes = HexUtils.hex2bin("404142434445464748494A4B4C4D4E4F");

// Derivation constants for session keys
public static final Map<KeyPurpose, byte[]> SCP02_CONSTANTS;
Expand Down Expand Up @@ -70,7 +70,7 @@ class PlaintextKeys extends GPCardKeys {
}

// If diverisification is to be used
String kdf_template;
private String kdf_template = null;

// Keyset version
private int version = 0x00;
Expand Down Expand Up @@ -422,6 +422,10 @@ public void setDiversifier(String template) {
this.kdf_template = template;
}

public String getDiversifier() {
return kdf_template;
}

@Override
public byte[] scp3_kdf(KeyPurpose purpose, byte[] a, byte[] b, int bytes) {
return GPCrypto.scp03_kdf(cardKeys.get(purpose), a, b, bytes);
Expand Down
1 change: 1 addition & 0 deletions tool/src/test/java/pro/javacard/gptool/TestPlaintextKeysProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import pro.javacard.gp.GPCardKeys;
import pro.javacard.gp.GPCrypto;
import pro.javacard.gp.GPSecureChannelVersion;
import pro.javacard.gptool.key.PlaintextKeys;

import java.util.Optional;

Expand Down