Fixe #281 (#283)

martinpaljak · Jan 25, 2022 · 903416f · 903416f
1 parent 86ebbda
commit 903416f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/src/main/java/pro/javacard/gp/GPSession.java b/library/src/main/java/pro/javacard/gp/GPSession.java
@@ -378,7 +378,7 @@ public void openSecureChannel(GPCardKeys keys, GPSecureChannelVersion scp, byte[
 
         // P1 key version (all)
         // P2 either key ID (SCP01) or 0 (SCP02)
-        CommandAPDU initUpdate = new CommandAPDU(CLA_GP, INS_INITIALIZE_UPDATE, keys.getKeyInfo().getVersion(), scp.scp == GPSecureChannelVersion.SCP.SCP01 ? keys.getKeyInfo().getID() : 0, host_challenge, 256);
+        CommandAPDU initUpdate = new CommandAPDU(CLA_GP, INS_INITIALIZE_UPDATE, keys.getKeyInfo().getVersion(), (scp != null && scp.scp == GPSecureChannelVersion.SCP.SCP01) ? keys.getKeyInfo().getID() : 0, host_challenge, 256);
 
         ResponseAPDU response = channel.transmit(initUpdate);
         int sw = response.getSW();