Osmocom Open Build Service

libosmocore.spec Changed

libosmocore_1.9.2.dsc -> libosmocore_1.9.3.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.9.2
+Version: 1.9.3
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- 9ad79b0b804c92bae5d413af88d7a3cd81200af0 1072360 libosmocore_1.9.2.tar.xz
+ d9c48e5684c36098d91628898c348067132190fd 1073048 libosmocore_1.9.3.tar.xz
 Checksums-Sha256:
- e35fcf89200b1779ba4b1891dd4eda2684e98e9fbd0251e218cf1616e540e0e3 1072360 libosmocore_1.9.2.tar.xz
+ a646354ac9737d7a22f4ba1e292f055d770f9c0d5a2bde42fc952bf0ee9bb1d1 1073048 libosmocore_1.9.3.tar.xz
 Files:
- d5e1fa80130e6fc67a085533e010d6f1 1072360 libosmocore_1.9.2.tar.xz
+ 592d76e96f759a1707d2f611725963df 1073048 libosmocore_1.9.3.tar.xz

libosmocore_1.9.2.tar.xz/.tarball-version -> libosmocore_1.9.3.tar.xz/.tarball-version Changed

libosmocore_1.9.2.tar.xz/debian/changelog -> libosmocore_1.9.3.tar.xz/debian/changelog Changed

libosmocore_1.9.2.tar.xz/src/sim/Makefile.am -> libosmocore_1.9.3.tar.xz/src/sim/Makefile.am Changed

libosmocore_1.9.2.tar.xz/src/sim/class_tables.c -> libosmocore_1.9.3.tar.xz/src/sim/class_tables.c Changed

@@ -178,6 +178,7 @@
 {
 	uint8_t ins = hdr1;
 	uint8_t p1 = hdr2;
+	uint8_t p3 = hdr4;
 
 	switch (ins) {
 	case 0xE2:	/* STORE DATA */
@@ -187,6 +188,26 @@
 		default:
 			return 3;
 		}
+		break;
+	case 0xF2:
+		/* in their infinite wisdom, GlobalPlatform re-defined the CLA 8x / INS F2 command, so one can
+		 * take a guess if it's GlobalPlatform or ETSI.  Lucikly, the P1 coding of ETSI so far
+		 * states all the four upper bits must be 0, while GP always has one of those bits set */
+		if (p1 & 0xF0)
+			return 4; /* GlobalPlatform v2.2 11.4.2 */
+		else
+			return 2; /* ETSI TS 102 221 V16.2.0 11.1.2 */
+		break;
+	case 0xCA:
+	case 0xCB:
+		/* in their infinite wisdom, GlobalPlatform made GET DATA a command that can be either APDU
+		 * case 2 or case 4.  As the specify Le must be 0x00, we can conclude that P3 == 0x00 must be
+		 * Le, while P3 != 0x00 must be Lc and hence case 4 */
+		if (p3 == 0x00)
+			return 2;
+		else
+			return 4;
+		break;
 	}
 	return 0;
 }
@@ -215,9 +236,9 @@
 static const uint8_t gp_ins_tbl_8ce256 = {
 	0xE4		= 4,	/* DELETE */
 	0xE2		= 0x80,	/* STORE DATA */
-	0xCA		= 4,	/* GET DATA */
-	0xCB		= 4,	/* GET DATA */
-	0xF2		= 4,	/* GET STATUS */
+	0xCA		= 0x80,	/* GET DATA */
+	0xCB		= 0x80,	/* GET DATA */
+	0xF2		= 0x80,	/* GET STATUS */
 	0xE6		= 4,	/* INSTALL */
 	0xE8		= 4,	/* LOAD */
 	0xD8		= 4,	/* PUT KEY */
@@ -245,6 +266,12 @@
 		.helper		= uicc046_cla_ins_helper,
 		.ins_tbl	= uicc_ins_tbl_046,
 	}, {
+		/* must be before uicc_ins_tbl_8ce below with same CLA+mask */
+		.cla		= 0x80,
+		.cla_mask	= 0xF0,
+		.helper		= gp_cla_ins_helper,
+		.ins_tbl	= gp_ins_tbl_8ce,
+	}, {
 		.cla		= 0x80,
 		.cla_mask	= 0xF0,
 		.ins_tbl	= uicc_ins_tbl_8ce,
@@ -257,11 +284,6 @@
 		.cla_mask	= 0xF0,
 		.ins_tbl	= uicc_ins_tbl_8ce,
 	}, {
-		.cla		= 0x80,
-		.cla_mask	= 0xF0,
-		.helper		= gp_cla_ins_helper,
-		.ins_tbl	= gp_ins_tbl_8ce,
-	}, {
 		.cla		= 0xC0,
 		.cla_mask	= 0xF0,
 		.helper		= gp_cla_ins_helper,
@@ -307,6 +329,12 @@
 		.helper		= uicc046_cla_ins_helper,
 		.ins_tbl	= uicc_ins_tbl_046,
 	}, {
+		/* must be before uicc_ins_tbl_8ce below with same CLA+mask */
+		.cla		= 0x80,
+		.cla_mask	= 0xF0,
+		.helper		= gp_cla_ins_helper,
+		.ins_tbl	= gp_ins_tbl_8ce,
+	}, {
 		.cla		= 0x80,
 		.cla_mask	= 0xF0,
 		.ins_tbl	= uicc_ins_tbl_8ce,

libosmocore_1.9.2.tar.xz/tests/sim/sim_test.c -> libosmocore_1.9.3.tar.xz/tests/sim/sim_test.c Changed

libosmocore_1.9.2.tar.xz/tests/sim/sim_test.ok -> libosmocore_1.9.3.tar.xz/tests/sim/sim_test.ok Changed

Changes of Revision 9