<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17556">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;">osmo-sim-test: Also [attempt to] dump DF.GSM on USIM cards<br><br>an USIM application can very well exist on a UICC without supporting<br>classic DF.GSM access.  However, most commonly, both are found on<br>cards.<br><br>Change-Id: I6180a3f81a7d3006e8ece4302c2433db2588bfaa<br>---<br>M src/sim/card_fs_uicc.c<br>M src/sim/card_fs_usim.c<br>M utils/osmo-sim-test.c<br>3 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sim/card_fs_uicc.c b/src/sim/card_fs_uicc.c</span><br><span>index c73fc9a..5dcaaa1 100644</span><br><span>--- a/src/sim/card_fs_uicc.c</span><br><span>+++ b/src/sim/card_fs_uicc.c</span><br><span>@@ -231,7 +231,7 @@</span><br><span> /* Annex E - TS 101 220 */</span><br><span> static const uint8_t __attribute__((__unused__)) adf_uicc_aid[] = { 0xA0, 0x00, 0x00, 0x00, 0x87, 0x10, 0x01 };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osim_card_profile *osim_cprof_uicc(void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+struct osim_card_profile *osim_cprof_uicc(void *ctx, bool have_df_gsm)</span><br><span> {</span><br><span>        struct osim_card_profile *cprof;</span><br><span>     struct osim_file_desc *mf;</span><br><span>@@ -255,5 +255,14 @@</span><br><span>            return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (have_df_gsm) {</span><br><span style="color: hsl(120, 100%, 40%);">+            /* DF.GSM as sub-directory of MF */</span><br><span style="color: hsl(120, 100%, 40%);">+           rc = osim_int_cprof_add_gsm(mf);</span><br><span style="color: hsl(120, 100%, 40%);">+              if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        talloc_free(cprof);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  return cprof;</span><br><span> }</span><br><span>diff --git a/src/sim/card_fs_usim.c b/src/sim/card_fs_usim.c</span><br><span>index 97f712a..d5d2736 100644</span><br><span>--- a/src/sim/card_fs_usim.c</span><br><span>+++ b/src/sim/card_fs_usim.c</span><br><span>@@ -345,14 +345,5 @@</span><br><span>       /* OMA BCAST Smart Card Profile */</span><br><span>   add_df_with_ef(uadf, 0x5F80, "DF.BCAST", NULL, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">-   /* DF.GSM as sub-directory of MF */</span><br><span style="color: hsl(0, 100%, 40%);">-     rc = osim_int_cprof_add_gsm(mf);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          talloc_free(cprof);</span><br><span style="color: hsl(0, 100%, 40%);">-             return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>      return aprof;</span><br><span> }</span><br><span>diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c</span><br><span>index e71d0ef..6cf36a6 100644</span><br><span>--- a/utils/osmo-sim-test.c</span><br><span>+++ b/utils/osmo-sim-test.c</span><br><span>@@ -341,7 +341,7 @@</span><br><span> </span><br><span> </span><br><span> extern struct osim_card_profile *osim_cprof_sim(void *ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-extern struct osim_card_profile *osim_cprof_uicc(void *ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osim_card_profile *osim_cprof_uicc(void *ctx, bool have_df_gsm);</span><br><span> </span><br><span> static int dump_file(struct osim_chan_hdl *chan, const char *short_name, uint16_t fid)</span><br><span> {</span><br><span>@@ -652,7 +652,7 @@</span><br><span> </span><br><span>    rc = osim_uicc_scan_apps(chan);</span><br><span>      if (rc >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-               chan->card->prof = osim_cprof_uicc(chan->card);</span><br><span style="color: hsl(120, 100%, 40%);">+              chan->card->prof = osim_cprof_uicc(chan->card, true);</span><br><span>               chan->cwd = chan->card->prof->mf;</span><br><span>        } else if (rc == -0x6e00) {</span><br><span>          /* CLA not supported: must be classic SIM, not USIM */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17556">change 17556</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/+/17556"/><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: I6180a3f81a7d3006e8ece4302c2433db2588bfaa </div>
<div style="display:none"> Gerrit-Change-Number: 17556 </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>