<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16977">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;">pySim-prog.py: add presence/length checks for user-provided SPN<br><br>Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0<br>---<br>M pySim-prog.py<br>M pySim/cards.py<br>2 files changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index bfb40b2..09a5d70 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -274,6 +274,10 @@</span><br><span>   # Digitize MCC/MNC (5 or 6 digits)</span><br><span>   plmn_digits = _mcc_mnc_digits(mcc, mnc)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if opts.name is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+             if len(opts.name) > 16:</span><br><span style="color: hsl(120, 100%, 40%);">+                    raise ValueError('Service Provider Name must max 16 characters!');</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         # ICCID (19 digits, E.118), though some phase1 vendors use 20 :(</span><br><span>     if opts.iccid is not None:</span><br><span>           iccid = opts.iccid</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index faaeca3..022182c 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -613,8 +613,9 @@</span><br><span>                        data, sw = self._scc.update_binary('00F7', content)</span><br><span> </span><br><span>              # set Service Provider Name</span><br><span style="color: hsl(0, 100%, 40%);">-             content = enc_spn(p['name'], True, True)</span><br><span style="color: hsl(0, 100%, 40%);">-                data, sw = self._scc.update_binary('6F46', rpad(content, 32))</span><br><span style="color: hsl(120, 100%, 40%);">+         if p.get('name') is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+                 content = enc_spn(p['name'], True, True)</span><br><span style="color: hsl(120, 100%, 40%);">+                      data, sw = self._scc.update_binary('6F46', rpad(content, 32))</span><br><span> </span><br><span>            # write EF.IMSI</span><br><span>              data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi']))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16977">change 16977</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/pysim/+/16977"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 </div>
<div style="display:none"> Gerrit-Change-Number: 16977 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>