<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23169">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils.py: de-couple sanitize_pin_adm from argparse 'opts'<br><br>This allows the function to be re-used in other contexts<br><br>Change-Id: I116e85acca3aeb0a0c24f74653c500ac2dc1d844<br>---<br>M pySim-prog.py<br>M pySim/utils.py<br>2 files changed, 8 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/23169/1</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 fbf2b73..4f54963 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -446,7 +446,7 @@</span><br><span>         else:</span><br><span>                opc = ''.join(['%02x' % random.randrange(0,256) for i in range(16)])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        pin_adm = sanitize_pin_adm(opts)</span><br><span style="color: hsl(120, 100%, 40%);">+      pin_adm = sanitize_pin_adm(opts.pin_adm, opts.pin_adm_hex)</span><br><span> </span><br><span>       # ePDG Selection Information</span><br><span>         if opts.epdgSelection:</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 1373551..a733d87 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -571,7 +571,7 @@</span><br><span> </span><br><span>        return s</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def sanitize_pin_adm(opts):</span><br><span style="color: hsl(120, 100%, 40%);">+def sanitize_pin_adm(pin_adm, pin_adm_hex = None):</span><br><span>  """</span><br><span>   The ADM pin can be supplied either in its hexadecimal form or as</span><br><span>     ascii string. This function checks the supplied opts parameter and</span><br><span>@@ -579,19 +579,17 @@</span><br><span>   it was originally supplied by the user</span><br><span>       """</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  pin_adm = None</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  if opts.pin_adm is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-            if len(opts.pin_adm) <= 8:</span><br><span style="color: hsl(0, 100%, 40%);">-                   pin_adm = ''.join(['%02x'%(ord(x)) for x in opts.pin_adm])</span><br><span style="color: hsl(120, 100%, 40%);">+    if pin_adm is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+               if len(pin_adm) <= 8:</span><br><span style="color: hsl(120, 100%, 40%);">+                      pin_adm = ''.join(['%02x'%(ord(x)) for x in pin_adm])</span><br><span>                        pin_adm = rpad(pin_adm, 16)</span><br><span> </span><br><span>              else:</span><br><span>                        raise ValueError("PIN-ADM needs to be <=8 digits (ascii)")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if opts.pin_adm_hex is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-                if len(opts.pin_adm_hex) == 16:</span><br><span style="color: hsl(0, 100%, 40%);">-                 pin_adm = opts.pin_adm_hex</span><br><span style="color: hsl(120, 100%, 40%);">+    if pin_adm_hex is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+           if len(pin_adm_hex) == 16:</span><br><span style="color: hsl(120, 100%, 40%);">+                    pin_adm = pin_adm_hex</span><br><span>                        # Ensure that it's hex-encoded</span><br><span>                   try:</span><br><span>                                 try_encode = h2b(pin_adm)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23169">change 23169</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/+/23169"/><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: I116e85acca3aeb0a0c24f74653c500ac2dc1d844 </div>
<div style="display:none"> Gerrit-Change-Number: 23169 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>