Commit e11deb65 authored by Sebastian Hans's avatar Sebastian Hans
Browse files

CR-022 SCP(15)000153 

-add constant value for additional file in the test-file system
-change the TestToolkitApplet.opt to integrate into automatic building
-updated .cap, .exp, .jca file
-added the text version of the export file
parent 5b4c752e

source/Annex_D_UiccTestUtil/uicc/test/util/TestToolkitApplet.opt

+0 −1
Original line number Diff line number Diff line 
-exportpath ..\..\Export;.\

-out EXP CAP JCA

uicc.test.util 0xA0:0x00:0x00:0x00:0x09:0x00:0x05:0xFF:0xFF:0xFF:0xFF:0x89:0xF0:0x00:0x00:0x00 1.0
 
 No newline at end of file

source/Annex_D_UiccTestUtil/uicc/test/util/UICCTestConstants.java

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ public class UICCTestConstants { 
    

    public final static short FID_ADF      = (short)0x7FFF;



    public final static short FID_EF_NOSH2 = (short)0x6FC6;

    public final static short FID_EF_LTERM = (short)0x6FC7;

    public final static short FID_EF_CTERM = (short)0x6FC8;



    public final byte[] AID_ADF1 = {(byte)0xA0, (byte)0x00, (byte)0x00, (byte)0x00,

                                    (byte)0x09, (byte)0x00, (byte)0x05, (byte)0xFF,

                                    (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0x89,

source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.jca

+17 −14
Original line number Diff line number Diff line 
// converted by version 1.3

// on Wed Sep 27 10:19:00 CEST 2006

// on Fri May 21 21:05:31 CEST 2021



.package uicc/test/util {

	.aid 0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0xF0:0x0:0x0:0x0;

	.version 1.0;



	.imports {

		0xA0:0x0:0x0:0x0:0x62:0x1:0x1 1.2;		//javacard/framework

		0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0x12:0x0:0x0:0x0 1.0;		//uicc/toolkit

		0xA0:0x0:0x0:0x0:0x62:0x1:0x1 1.3;		//javacard/framework

		0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0x12:0x0:0x0:0x0 1.4;		//uicc/toolkit

		0xA0:0x0:0x0:0x0:0x62:0x0:0x1 1.0;		//java/lang

	}
@@ -31,17 +31,17 @@ 
			.descriptor	Ljavacard/framework/AID;	0.6;



		// 8

		virtualMethodRef 0.6.3([BS)B;		// javacard/framework/AID.getBytes([BS)B

		virtualMethodRef 0.6.3([BS)B;		// getBytes([BS)B

		// 9

		staticMethodRef 0.16.3([BSSB)S;		// javacard/framework/Util.arrayFillNonAtomic([BSSB)S

		// 10

		virtualMethodRef 0.3.3()Z;		// javacard/framework/Applet.selectingApplet()Z

		virtualMethodRef 0.3.3()Z;		// selectingApplet()Z

		// 11

		virtualMethodRef 0.10.7()S;		// javacard/framework/APDU.setOutgoing()S

		virtualMethodRef 0.10.7()S;		// setOutgoing()S

		// 12

		virtualMethodRef 0.10.9(S)V;		// javacard/framework/APDU.setOutgoingLength(S)V

		virtualMethodRef 0.10.9(S)V;		// setOutgoingLength(S)V

		// 13

		virtualMethodRef 0.10.5([BSS)V;		// javacard/framework/APDU.sendBytesLong([BSS)V

		virtualMethodRef 0.10.5([BSS)V;		// sendBytesLong([BSS)V

		// 14

		staticMethodRef 0.7.1(S)V;		// javacard/framework/ISOException.throwIt(S)V

		// 15
@@ -129,7 +129,7 @@ 
					invokestatic 7;		// javacard/framework/JCSystem.getAID()Ljavacard/framework/AID;

					getfield_a_this 0;		// reference uicc/test/util/TestToolkitApplet.baTestAppletId

					sconst_1;

					invokevirtual 8;		// javacard/framework/AID.getBytes([BS)B

					invokevirtual 8;		// getBytes([BS)B

					bastore;

					getfield_a_this 1;		// reference uicc/test/util/TestToolkitApplet.baTestsResults

					sconst_0;
@@ -188,10 +188,10 @@ 
			.descriptor	Ljavacard/framework/APDU;	0.10;



				L0:	aload_0;

					invokevirtual 10;		// javacard/framework/Applet.selectingApplet()Z

					invokevirtual 10;		// selectingApplet()Z

					ifeq L2;

				L1:	aload_1;

					invokevirtual 11;		// javacard/framework/APDU.setOutgoing()S

					invokevirtual 11;		// setOutgoing()S

					pop;

					aload_1;

					getfield_a_this 0;		// reference uicc/test/util/TestToolkitApplet.baTestAppletId
@@ -203,7 +203,7 @@ 
					sadd;

					sconst_2;

					sadd;

					invokevirtual 12;		// javacard/framework/APDU.setOutgoingLength(S)V

					invokevirtual 12;		// setOutgoingLength(S)V

					aload_1;

					getfield_a_this 0;		// reference uicc/test/util/TestToolkitApplet.baTestAppletId

					sconst_0;
@@ -212,7 +212,7 @@ 
					baload;

					sconst_1;

					sadd;

					invokevirtual 13;		// javacard/framework/APDU.sendBytesLong([BSS)V

					invokevirtual 13;		// sendBytesLong([BSS)V

					aload_1;

					getfield_a_this 1;		// reference uicc/test/util/TestToolkitApplet.baTestsResults

					sconst_0;
@@ -221,7 +221,7 @@ 
					baload;

					sconst_1;

					sadd;

					invokevirtual 13;		// javacard/framework/APDU.sendBytesLong([BSS)V

					invokevirtual 13;		// sendBytesLong([BSS)V

					goto L3;

				L2:	sspush 27904;

					invokestatic 14;		// javacard/framework/ISOException.throwIt(S)V
@@ -307,6 +307,9 @@ 
			public static final short FID_EF_ARR_ADF = 28422;		// S

			public static final short FID_EF_UICC = 12260;		// S

			public static final short FID_ADF = 32767;		// S

			public static final short FID_EF_NOSH2 = 28614;		// S

			public static final short FID_EF_LTERM = 28615;		// S

			public static final short FID_EF_CTERM = 28616;		// S

		}



		.publicMethodTable 1 {