expose scp03 related methods from gpcrypto

martinpaljak · martinpaljak · commit 4d5c3849b1b1 · 2025-07-07T08:10:20.000+03:00
diff --git a/library/src/main/java/pro/javacard/gp/GPCrypto.java b/library/src/main/java/pro/javacard/gp/GPCrypto.java
@@ -194,7 +194,7 @@ public static byte[] mac_des_3des(byte[] key, byte[] data, byte[] iv) {
     }
 
     // SCP03 related
-    static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {
+    public static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {
         // Use BouncyCastle light interface.
         BlockCipher cipher = AESEngine.newInstance();
         CMac cmac = new CMac(cipher);
@@ -205,7 +205,7 @@ static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {
         return Arrays.copyOf(out, lengthBits / 8);
     }
 
-    static byte[] scp03_kdf_blocka(byte constant, int blocklen_bits) {
+    public static byte[] scp03_kdf_blocka(byte constant, int blocklen_bits) {
         // 11 bytes
         byte[] label = new byte[]{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public static byte[] mac_des_3des(byte[] key, byte[] data, byte[] iv) {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`// SCP03 related`
`197`		`- static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {`
	`197`	`+ public static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {`
`198`	`198`	`// Use BouncyCastle light interface.`
`199`	`199`	`BlockCipher cipher = AESEngine.newInstance();`
`200`	`200`	`CMac cmac = new CMac(cipher);`
`@@ -205,7 +205,7 @@ static byte[] aes_cmac(byte[] key, byte[] data, int lengthBits) {`
`205`	`205`	`return Arrays.copyOf(out, lengthBits / 8);`
`206`	`206`	`}`
`207`	`207`
`208`		`- static byte[] scp03_kdf_blocka(byte constant, int blocklen_bits) {`
	`208`	`+ public static byte[] scp03_kdf_blocka(byte constant, int blocklen_bits) {`
`209`	`209`	`// 11 bytes`
`210`	`210`	`byte[] label = new byte[]{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};`
`211`	`211`