<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20896">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Replace tabs by spaces<br><br>± pycodestyle osmo-sim-auth.py<br>osmo-sim-auth.py:31:1: W191 indentation contains tabs<br>osmo-sim-auth.py:32:1: W191 indentation contains tabs<br>[...]<br><br>Change-Id: Id026fcd3975113a8bec2e30c58ac7b521ec1707f<br>---<br>M osmo-sim-auth.py<br>1 file changed, 79 insertions(+), 79 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 3224e15..c580dad 100755</span><br><span>--- a/osmo-sim-auth.py</span><br><span>+++ b/osmo-sim-auth.py</span><br><span>@@ -28,107 +28,107 @@</span><br><span> from card.SIM import SIM</span><br><span> </span><br><span> def handle_usim(options, rand_bin, autn_bin):</span><br><span style="color: hsl(0, 100%, 40%);">- u = USIM()</span><br><span style="color: hsl(0, 100%, 40%);">- if not u:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Error opening USIM")</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+ u = USIM()</span><br><span style="color: hsl(120, 100%, 40%);">+ if not u:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening USIM")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if options.debug:</span><br><span style="color: hsl(0, 100%, 40%);">- u.dbg = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if options.debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ u.dbg = 2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- 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%);">+ imsi = u.get_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(0, 100%, 40%);">- ret = u.authenticate(rand_bin, autn_bin, ctx='3G')</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\nUMTS Authentication")</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = u.authenticate(rand_bin, autn_bin, ctx='3G')</span><br><span> if ret == None:</span><br><span> print("UMTS Authentication failed")</span><br><span> exit(1)</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- 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(0, 100%, 40%);">- 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%);">+ if len(ret) == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("AUTS:\t%s" % b2a_hex(byteToString(ret[0])))</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</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 style="color: hsl(120, 100%, 40%);">+ if len(ret) == 4:</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(0, 100%, 40%);">- ret = u.authenticate(rand_bin, autn_bin, ctx='2G')</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- 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("\nGSM Authentication")</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = u.authenticate(rand_bin, autn_bin, ctx='2G')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not len(ret) == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error during 2G authentication")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(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 style="color: hsl(0, 100%, 40%);">- s= SIM()</span><br><span style="color: hsl(0, 100%, 40%);">- if not s:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Error opening SIM")</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+ s= SIM()</span><br><span style="color: hsl(120, 100%, 40%);">+ if not s:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening SIM")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- imsi = s.get_imsi()</span><br><span style="color: hsl(0, 100%, 40%);">- 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%);">+ imsi = s.get_imsi()</span><br><span style="color: hsl(120, 100%, 40%);">+ if not options.ipsec:</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 style="color: hsl(0, 100%, 40%);">- ret = s.run_gsm_alg(rand_bin)</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = s.run_gsm_alg(rand_bin)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- 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%);">+ if not options.ipsec:</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 style="color: hsl(0, 100%, 40%);">- 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%);">+ if options.ipsec:</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 style="color: hsl(0, 100%, 40%);">- s= SIM()</span><br><span style="color: hsl(0, 100%, 40%);">- if not s:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Error opening SIM")</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+ s= SIM()</span><br><span style="color: hsl(120, 100%, 40%);">+ if not s:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Error opening SIM")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if options.debug:</span><br><span style="color: hsl(0, 100%, 40%);">- s.dbg = 1</span><br><span style="color: hsl(120, 100%, 40%);">+ if options.debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ s.dbg = 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- s.caller.get(options.param)()</span><br><span style="color: hsl(120, 100%, 40%);">+ s.caller.get(options.param)()</span><br><span> </span><br><span> if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">- parser = OptionParser()</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-a", "--autn", dest="autn",</span><br><span style="color: hsl(0, 100%, 40%);">- help="AUTN parameter from AuC")</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-r", "--rand", dest="rand",</span><br><span style="color: hsl(0, 100%, 40%);">- help="RAND parameter from AuC")</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-d", "--debug", dest="debug",</span><br><span style="color: hsl(0, 100%, 40%);">- help="Enable debug output",</span><br><span style="color: hsl(0, 100%, 40%);">- action="store_true")</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-s", "--sim", dest="sim",</span><br><span style="color: hsl(0, 100%, 40%);">- help="SIM mode (default: USIM)",</span><br><span style="color: hsl(0, 100%, 40%);">- action="store_true", default=False)</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-I", "--ipsec", dest="ipsec",</span><br><span style="color: hsl(0, 100%, 40%);">- help="IPSEC mode for strongswan triplets.dat",</span><br><span style="color: hsl(0, 100%, 40%);">- action="store_true")</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-p", "--param", dest="param",</span><br><span style="color: hsl(0, 100%, 40%);">- help="Retrieve SIM card parameter (mode: SIM) KC|IMSI|LOCI|HPPLMN|PLMN_SEL|ICCID|ACC|FPLMN|MSISDN|SMSP")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser = OptionParser()</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-a", "--autn", dest="autn",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="AUTN parameter from AuC")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-r", "--rand", dest="rand",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="RAND parameter from AuC")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-d", "--debug", dest="debug",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="Enable debug output",</span><br><span style="color: hsl(120, 100%, 40%);">+ action="store_true")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-s", "--sim", dest="sim",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="SIM mode (default: USIM)",</span><br><span style="color: hsl(120, 100%, 40%);">+ action="store_true", default=False)</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-I", "--ipsec", dest="ipsec",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="IPSEC mode for strongswan triplets.dat",</span><br><span style="color: hsl(120, 100%, 40%);">+ action="store_true")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-p", "--param", dest="param",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="Retrieve SIM card parameter (mode: SIM) KC|IMSI|LOCI|HPPLMN|PLMN_SEL|ICCID|ACC|FPLMN|MSISDN|SMSP")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- (options, args) = parser.parse_args()</span><br><span style="color: hsl(120, 100%, 40%);">+ (options, args) = parser.parse_args()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if options.param:</span><br><span style="color: hsl(0, 100%, 40%);">- handle_sim_info(options)</span><br><span style="color: hsl(0, 100%, 40%);">- exit(2)</span><br><span style="color: hsl(120, 100%, 40%);">+ if options.param:</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sim_info(options)</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- exit(2)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not options.rand:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("You have to specify RAND")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rand_bin = stringToByte(a2b_hex(options.rand))</span><br><span style="color: hsl(0, 100%, 40%);">- if options.autn:</span><br><span style="color: hsl(0, 100%, 40%);">- autn_bin = stringToByte(a2b_hex(options.autn))</span><br><span style="color: hsl(120, 100%, 40%);">+ rand_bin = stringToByte(a2b_hex(options.rand))</span><br><span style="color: hsl(120, 100%, 40%);">+ if options.autn:</span><br><span style="color: hsl(120, 100%, 40%);">+ autn_bin = stringToByte(a2b_hex(options.autn))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if options.sim == True:</span><br><span style="color: hsl(0, 100%, 40%);">- handle_sim(options, rand_bin)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- exit(2)</span><br><span style="color: hsl(0, 100%, 40%);">- handle_usim(options, rand_bin, autn_bin)</span><br><span style="color: hsl(120, 100%, 40%);">+ if options.sim == True:</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sim(options, rand_bin)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not options.autn:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("You have to specify AUTN")</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2)</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/+/20896">change 20896</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/+/20896"/><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: Id026fcd3975113a8bec2e30c58ac7b521ec1707f </div>
<div style="display:none"> Gerrit-Change-Number: 20896 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>