<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20895">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Convert to Python3 using 2to3<br><br>Change-Id: I70a95fec06a18ff6ebedcc1b6c48a16304047770<br>---<br>M osmo-sim-auth.py<br>1 file changed, 22 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-sim-auth.py b/osmo-sim-auth.py</span><br><span>index 6ba9557..3224e15 100755</span><br><span>--- a/osmo-sim-auth.py</span><br><span>+++ b/osmo-sim-auth.py</span><br><span>@@ -30,61 +30,61 @@</span><br><span> def handle_usim(options, rand_bin, autn_bin):</span><br><span> u = USIM()</span><br><span> if not u:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Error opening USIM"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening USIM")</span><br><span> exit(1)</span><br><span> </span><br><span> if options.debug:</span><br><span> u.dbg = 2;</span><br><span> </span><br><span> imsi = u.get_imsi()</span><br><span style="color: hsl(0, 100%, 40%);">- print "Testing USIM card with IMSI %s" % imsi</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Testing USIM card with IMSI %s" % imsi)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "\nUMTS Authentication"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\nUMTS Authentication")</span><br><span> ret = u.authenticate(rand_bin, autn_bin, ctx='3G')</span><br><span> if ret == None:</span><br><span style="color: hsl(0, 100%, 40%);">- print "UMTS Authentication failed"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("UMTS Authentication failed")</span><br><span> exit(1)</span><br><span> if len(ret) == 1:</span><br><span style="color: hsl(0, 100%, 40%);">- print "AUTS:\t%s" % b2a_hex(byteToString(ret[0]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("AUTS:\t%s" % b2a_hex(byteToString(ret[0])))</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- print "RES:\t%s" % b2a_hex(byteToString(ret[0]))</span><br><span style="color: hsl(0, 100%, 40%);">- print "CK:\t%s" % b2a_hex(byteToString(ret[1]))</span><br><span style="color: hsl(0, 100%, 40%);">- print "IK:\t%s" % b2a_hex(byteToString(ret[2]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("RES:\t%s" % b2a_hex(byteToString(ret[0])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("CK:\t%s" % b2a_hex(byteToString(ret[1])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("IK:\t%s" % b2a_hex(byteToString(ret[2])))</span><br><span> if len(ret) == 4:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Kc:\t%s" % b2a_hex(byteToString(ret[3]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Kc:\t%s" % b2a_hex(byteToString(ret[3])))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "\nGSM Authentication"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\nGSM Authentication")</span><br><span> ret = u.authenticate(rand_bin, autn_bin, ctx='2G')</span><br><span> if not len(ret) == 2:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Error during 2G authentication"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error during 2G authentication")</span><br><span> exit(1)</span><br><span style="color: hsl(0, 100%, 40%);">- print "SRES:\t%s" % b2a_hex(byteToString(ret[0]))</span><br><span style="color: hsl(0, 100%, 40%);">- print "Kc:\t%s" % b2a_hex(byteToString(ret[1]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("SRES:\t%s" % b2a_hex(byteToString(ret[0])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Kc:\t%s" % b2a_hex(byteToString(ret[1])))</span><br><span> </span><br><span> def handle_sim(options, rand_bin):</span><br><span> s= SIM()</span><br><span> if not s:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Error opening SIM"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening SIM")</span><br><span> exit(1)</span><br><span> </span><br><span> imsi = s.get_imsi()</span><br><span> if not options.ipsec:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Testing SIM card with IMSI %s" % imsi</span><br><span style="color: hsl(0, 100%, 40%);">- print "\nGSM Authentication"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Testing SIM card with IMSI %s" % imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\nGSM Authentication")</span><br><span> </span><br><span> ret = s.run_gsm_alg(rand_bin)</span><br><span> </span><br><span> if not options.ipsec:</span><br><span style="color: hsl(0, 100%, 40%);">- print "SRES:\t%s" % b2a_hex(byteToString(ret[0]))</span><br><span style="color: hsl(0, 100%, 40%);">- print "Kc:\t%s" % b2a_hex(byteToString(ret[1]))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("SRES:\t%s" % b2a_hex(byteToString(ret[0])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Kc:\t%s" % b2a_hex(byteToString(ret[1])))</span><br><span> </span><br><span> if options.ipsec:</span><br><span style="color: hsl(0, 100%, 40%);">- print "1%s@uma.mnc%s.mcc%s.3gppnetwork.org,%s,%s,%s" % (imsi, imsi[3:6], imsi[0:3], b2a_hex(byteToString(rand_bin)), b2a_hex(byteToString(ret[0])), b2a_hex(byteToString(ret[1])))</span><br><span style="color: hsl(120, 100%, 40%);">+ print("1%s@uma.mnc%s.mcc%s.3gppnetwork.org,%s,%s,%s" % (imsi, imsi[3:6], imsi[0:3], b2a_hex(byteToString(rand_bin)), b2a_hex(byteToString(ret[0])), b2a_hex(byteToString(ret[1]))))</span><br><span> </span><br><span> def handle_sim_info(options):</span><br><span> s= SIM()</span><br><span> if not s:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Error opening SIM"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening SIM")</span><br><span> exit(1)</span><br><span> </span><br><span> if options.debug:</span><br><span>@@ -117,7 +117,7 @@</span><br><span> exit(2)</span><br><span> </span><br><span> if not options.rand:</span><br><span style="color: hsl(0, 100%, 40%);">- print "You have to specify RAND"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("You have to specify RAND")</span><br><span> exit(2)</span><br><span> </span><br><span> rand_bin = stringToByte(a2b_hex(options.rand))</span><br><span>@@ -128,7 +128,7 @@</span><br><span> handle_sim(options, rand_bin)</span><br><span> else:</span><br><span> if not options.autn:</span><br><span style="color: hsl(0, 100%, 40%);">- print "You have to specify AUTN"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("You have to specify AUTN")</span><br><span> exit(2)</span><br><span> handle_usim(options, rand_bin, autn_bin)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20895">change 20895</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/osmo-sim-auth/+/20895"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sim-auth </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I70a95fec06a18ff6ebedcc1b6c48a16304047770 </div>
<div style="display:none"> Gerrit-Change-Number: 20895 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: rousseau <ludovic.rousseau+osmocom@free.fr> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>