This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
herlesupreeth gerrit-no-reply at lists.osmocom.orgherlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16951 )
Change subject: Merge remote gerrit onto local master
......................................................................
Merge remote gerrit onto local master
Change-Id: I187cbea985c705403c239a365505ac218d8b60a0
---
M pySim-prog.py
M pySim/cards.py
3 files changed, 3 insertions(+), 39 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/16951/1
diff --git a/pySim-prog.py b/pySim-prog.py
index 20487b8..48292ec 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -165,15 +165,11 @@
parser.add_option("--dry-run", dest="dry_run",
help="Perform a 'dry run', don't actually program the card",
default=False, action="store_true")
-
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
parser.add_option("--msisdn", dest="msisdn",
help="MSISDN",
)
-=======
parser.add_option("--card_handler", dest="card_handler", metavar="FILE",
help="Use automatic card handling machine")
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
(options, args) = parser.parse_args()
diff --git a/pySim/cards.py b/pySim/cards.py
index 31a8b60..249f6c5 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -87,11 +87,7 @@
def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'):
"""
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- See note in update_hplmn_act()
-=======
See note in update_hplmn_act()
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
"""
# get size and write EF.OPLMNwAcT
data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)
@@ -103,11 +99,7 @@
def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):
"""
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- See note in update_hplmn_act()
-=======
See note in update_hplmn_act()
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
"""
# get size and write EF.PLMNwAcT
data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)
@@ -132,11 +124,7 @@
#See also: 3GPP TS 31.102, chapter 4.2.18
mnclen = len(str(mnc))
if mnclen == 1:
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- mnclen = 2
-=======
mnclen = 2
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
if mnclen > 3:
raise RuntimeError('unable to calculate proper mnclen')
@@ -622,9 +610,9 @@
data, sw = self._scc.update_binary('00FF', p['ki'])
# set OPc in proprietary file
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- content = "01" + p['opc']
- data, sw = self._scc.update_binary('00F7', content)
+ if 'opc' in p:
+ content = "01" + p['opc']
+ data, sw = self._scc.update_binary('00F7', content)
# set Service Provider Name
if p.get('name') is not None:
@@ -633,11 +621,6 @@
if p.get('acc') is not None:
self.update_acc(p['acc'])
-=======
- if 'opc' in p:
- content = "01" + p['opc']
- data, sw = self._scc.update_binary('00F7', content)
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
# write EF.IMSI
data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi']))
@@ -646,11 +629,7 @@
if p.get('mcc') and p.get('mnc'):
sw = self.update_plmnsel(p['mcc'], p['mnc'])
if sw != '9000':
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- rint("Programming PLMNsel failed with code %s"%sw)
-=======
print("Programming PLMNsel failed with code %s"%sw)
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
# EF.PLMNwAcT
if p.get('mcc') and p.get('mnc'):
@@ -664,15 +643,12 @@
if sw != '9000':
print("Programming OPLMNwAcT failed with code %s"%sw)
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
# EF.HPLMNwAcT
if p.get('mcc') and p.get('mnc'):
sw = self.update_hplmn_act(p['mcc'], p['mnc'])
if sw != '9000':
print("Programming HPLMNwAcT failed with code %s"%sw)
-=======
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
# EF.AD
if p.get('mcc') and p.get('mnc'):
sw = self.update_ad(p['mnc'])
@@ -955,11 +931,7 @@
if sw != '9000':
print("Programming SMSP failed with code %s"%sw)
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- # EF.IMSI
-=======
# EF.IMSI
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
if p.get('imsi'):
sw = self.update_imsi(p['imsi'])
if sw != '9000':
@@ -995,9 +967,6 @@
if sw != '9000':
print("Programming AD failed with code %s"%sw)
-<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1)
- return None
-=======
return None
def erase(self):
@@ -1109,7 +1078,6 @@
self._scc.update_binary('af20', p['opc'], 17)
return
->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2)
def erase(self):
return
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/16951
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I187cbea985c705403c239a365505ac218d8b60a0
Gerrit-Change-Number: 16951
Gerrit-PatchSet: 1
Gerrit-Owner: herlesupreeth <herlesupreeth at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200120/f086c7d8/attachment.htm>