<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16951">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Merge remote gerrit onto local master<br><br>Change-Id: I187cbea985c705403c239a365505ac218d8b60a0<br>---<br>M pySim-prog.py<br>M pySim/cards.py<br>3 files changed, 3 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/16951/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 20487b8..48292ec 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -165,15 +165,11 @@</span><br><span> parser.add_option("--dry-run", dest="dry_run",</span><br><span> help="Perform a 'dry run', don't actually program the card",</span><br><span> default=False, action="store_true")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span> parser.add_option("--msisdn", dest="msisdn",</span><br><span> help="MSISDN",</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> parser.add_option("--card_handler", dest="card_handler", metavar="FILE",</span><br><span> help="Use automatic card handling machine")</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> </span><br><span> (options, args) = parser.parse_args()</span><br><span> </span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 31a8b60..249f6c5 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -87,11 +87,7 @@</span><br><span> </span><br><span> def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'):</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> """</span><br><span> # get size and write EF.OPLMNwAcT</span><br><span> data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)</span><br><span>@@ -103,11 +99,7 @@</span><br><span> </span><br><span> def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> """</span><br><span> # get size and write EF.PLMNwAcT</span><br><span> data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)</span><br><span>@@ -132,11 +124,7 @@</span><br><span> #See also: 3GPP TS 31.102, chapter 4.2.18</span><br><span> mnclen = len(str(mnc))</span><br><span> if mnclen == 1:</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- mnclen = 2</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> mnclen = 2</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> if mnclen > 3:</span><br><span> raise RuntimeError('unable to calculate proper mnclen')</span><br><span> </span><br><span>@@ -622,9 +610,9 @@</span><br><span> data, sw = self._scc.update_binary('00FF', p['ki'])</span><br><span> </span><br><span> # set OPc in proprietary file</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- content = "01" + p['opc']</span><br><span style="color: hsl(0, 100%, 40%);">- data, sw = self._scc.update_binary('00F7', content)</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'opc' in p:</span><br><span style="color: hsl(120, 100%, 40%);">+ content = "01" + p['opc']</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self._scc.update_binary('00F7', content)</span><br><span> </span><br><span> # set Service Provider Name</span><br><span> if p.get('name') is not None:</span><br><span>@@ -633,11 +621,6 @@</span><br><span> </span><br><span> if p.get('acc') is not None:</span><br><span> self.update_acc(p['acc'])</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">- if 'opc' in p:</span><br><span style="color: hsl(0, 100%, 40%);">- content = "01" + p['opc']</span><br><span style="color: hsl(0, 100%, 40%);">- data, sw = self._scc.update_binary('00F7', content)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</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>@@ -646,11 +629,7 @@</span><br><span> if p.get('mcc') and p.get('mnc'):</span><br><span> sw = self.update_plmnsel(p['mcc'], p['mnc'])</span><br><span> if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- rint("Programming PLMNsel failed with code %s"%sw)</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> print("Programming PLMNsel failed with code %s"%sw)</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> </span><br><span> # EF.PLMNwAcT</span><br><span> if p.get('mcc') and p.get('mnc'):</span><br><span>@@ -664,15 +643,12 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming OPLMNwAcT failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span> # EF.HPLMNwAcT</span><br><span> if p.get('mcc') and p.get('mnc'):</span><br><span> sw = self.update_hplmn_act(p['mcc'], p['mnc'])</span><br><span> if sw != '9000':</span><br><span> print("Programming HPLMNwAcT failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> # EF.AD</span><br><span> if p.get('mcc') and p.get('mnc'):</span><br><span> sw = self.update_ad(p['mnc'])</span><br><span>@@ -955,11 +931,7 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming SMSP failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- # EF.IMSI</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> # EF.IMSI</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> if p.get('imsi'):</span><br><span> sw = self.update_imsi(p['imsi'])</span><br><span> if sw != '9000':</span><br><span>@@ -995,9 +967,6 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming AD failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)</span><br><span style="color: hsl(0, 100%, 40%);">- return None</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span> return None</span><br><span> </span><br><span> def erase(self):</span><br><span>@@ -1109,7 +1078,6 @@</span><br><span> self._scc.update_binary('af20', p['opc'], 17)</span><br><span> </span><br><span> return</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)</span><br><span> </span><br><span> def erase(self):</span><br><span> return</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16951">change 16951</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/+/16951"/><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: I187cbea985c705403c239a365505ac218d8b60a0 </div>
<div style="display:none"> Gerrit-Change-Number: 16951 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>