<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17557">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">card_fs_{usim,isim}: Update to 15.7.0 / Release 15<br><br>Various new files and some new status words have been defined<br>by now. Let's add them.<br><br>Change-Id: Ia007281bcb61dcd8260d0a77203abeff21d5255f<br>---<br>M src/sim/card_fs_isim.c<br>M src/sim/card_fs_usim.c<br>2 files changed, 56 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sim/card_fs_isim.c b/src/sim/card_fs_isim.c</span><br><span>index 2970c45..f11c029 100644</span><br><span>--- a/src/sim/card_fs_isim.c</span><br><span>+++ b/src/sim/card_fs_isim.c</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /*! \file card_fs_isim.c</span><br><span> * 3GPP ISIM specific structures / routines. */</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2014 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2014-2020 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -34,16 +34,19 @@</span><br><span> #include "sim_int.h"</span><br><span> #include "gsm_int.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 31.103 Version 11.2.0 Release 11 / Chapoter 7.1.3 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* TS 31.103 Version 15.5.0 Release 15 / Chapter 7.1.3 */</span><br><span> const struct osim_card_sw ts31_103_sw[] = {</span><br><span> {</span><br><span> 0x9862, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span> .u.str = "Security management - Authentication error, incorrect MAC",</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x9864, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .u.str = "Security management - Authentication error, security context not supported",</span><br><span> },</span><br><span> OSIM_CARD_SW_LAST</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 31.103 Version 11.2.0 Release 11 / Chapoter 4.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* TS 31.103 Version 15.5.0 Release 15 / Chapter 4.2 */</span><br><span> static const struct osim_file_desc isim_ef_in_adf_isim[] = {</span><br><span> EF_TRANSP_N(0x6F02, 0x02, "EF.IMPI", 0, 1, 256,</span><br><span> "IMS private user identity"),</span><br><span>@@ -75,6 +78,14 @@</span><br><span> "Short message service parameters"),</span><br><span> EF_LIN_FIX_N(0x6FE7, SFI_NONE, "EF.UICCIARI", F_OPTIONAL, 1, 256,</span><br><span> "UICC IARI"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF7, SFI_NONE, "EF_FromPreferred", F_OPTIONAL, 1, 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ "From Preferred"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF8, SFI_NONE, "EF_IMSConfigData", F_OPTIONAL, 3, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMS Configuration Data"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FFC, SFI_NONE, "EF_XCAPConfigData", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "XCAP Configuration Data"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FFA, SFI_NONE, "EF_WebRTCURI", F_OPTIONAL, 3, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "WebRTC URI"),</span><br><span> };</span><br><span> </span><br><span> /* Annex E - TS 101 220 */</span><br><span>diff --git a/src/sim/card_fs_usim.c b/src/sim/card_fs_usim.c</span><br><span>index d5d2736..4c8f79c 100644</span><br><span>--- a/src/sim/card_fs_usim.c</span><br><span>+++ b/src/sim/card_fs_usim.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> #include "sim_int.h"</span><br><span> #include "gsm_int.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 31.102 Version 7.7.0 / Chapter 7.3 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* TS 31.102 Version 15.7.0 Release 15 / Chapter 7.3 */</span><br><span> const struct osim_card_sw ts31_102_sw[] = {</span><br><span> {</span><br><span> 0x9862, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span>@@ -43,11 +43,17 @@</span><br><span> }, {</span><br><span> 0x9865, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span> .u.str = "Security management - Key freshness error",</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x9866, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .u.str = "Security management - Authentication error, no memory space available",</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x9867, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .u.str = "Security management - Authentication error, no memory space available in EF_MUK",</span><br><span> },</span><br><span> OSIM_CARD_SW_LAST</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* 31.102 Chapter 4.4.3 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* 31.102 Version 15.7.0 Release 15 / Chapter 4.4.3 */</span><br><span> static const struct osim_file_desc usim_ef_in_df_gsm_access[] = {</span><br><span> EF_TRANSP_N(0x4f20, 0x01, "EF.Kc", 0, 9, 9,</span><br><span> "Ciphering Key Kc"),</span><br><span>@@ -59,7 +65,7 @@</span><br><span> "Investigation Scan"),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* 31.102 Chapter 4.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* 31.102 Version 15.7.0 Release 15 / Chapter 4.2 */</span><br><span> static const struct osim_file_desc usim_ef_in_adf_usim[] = {</span><br><span> EF_TRANSP(0x6F05, 0x02, "EF.LI", 0, 2, 16,</span><br><span> "Language Indication", &gsm_lp_decode, NULL),</span><br><span>@@ -243,6 +249,39 @@</span><br><span> "UICC IARI"),</span><br><span> EF_TRANSP_N(0x6FEC, SFI_NONE, "EF.PWS", F_OPTIONAL, 1, 32,</span><br><span> "Public Warning System"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FED, SFI_NONE, "EF_FDNURI", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Fixed Dialling Numbers URI"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FEE, SFI_NONE, "EF_BDNURI", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Barred Dialling Numbers URI"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FEF, SFI_NONE, "EF_SDNURI", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Service Dialling Numbers URI"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FF0, SFI_NONE, "EF_IWL", F_OPTIONAL, 18, 32,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMEI(SV) White Lists"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_CYCLIC_N(0x6FF1, SFI_NONE, "EF_IPS", F_OPTIONAL, 4, 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMEI(SV) Pairing Status"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FF2, SFI_NONE, "EF_IPD", F_OPTIONAL, 10, 16,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMEI(SV) of Pairing Device"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF3, SFI_NONE, "EF_ePDGId", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Home ePDG Identifier"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF4, SFI_NONE, "EF_ePDGSelection", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ePDG Selection Information"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF5, SFI_NONE, "EF_ePDGIdEm", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Emergency ePDG Identifier"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF6, SFI_NONE, "EF_ePDGSelectionEm", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ePDG Selection Information for Emergency Services"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF7, SFI_NONE, "EF_FromPreferred", F_OPTIONAL, 1, 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ "From Preferred"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF8, SFI_NONE, "EF_IMSConfigData", F_OPTIONAL, 3, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMS Configuration Data"),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* EF TVCONFIG (TV Configuration) has no fixed FID */</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FF9, SFI_NONE, "EF_3GPPPSDATAOFF", F_OPTIONAL, 4, 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ "3GPP PS Data Off"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_LIN_FIX_N(0x6FFA, SFI_NONE, "EF_3GPPPSDATAOFFservicelist", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "3GPP PS Data Off Service List"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FFC, SFI_NONE, "EF_XCAPConfigData", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "XCAP Configuration Data"),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_TRANSP_N(0x6FFD, SFI_NONE, "EF_EARFCNList", F_OPTIONAL, 1, 128,</span><br><span style="color: hsl(120, 100%, 40%);">+ "EARFCN list for MTC/NB-IOT UEs"),</span><br><span> };</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17557">change 17557</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/17557"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia007281bcb61dcd8260d0a77203abeff21d5255f </div>
<div style="display:none"> Gerrit-Change-Number: 17557 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>