Compare commits
No commits in common. "fb9d5f75918fc9b009e18de4c38089419b6fdb4b" and "12ce2512be58a6c5a3c06278baad764fd8c24b93" have entirely different histories.
fb9d5f7591
...
12ce2512be
|
@ -91,7 +91,7 @@ sysmo_isimsja5_algorithms = sysmo_isimsja2_algorithms + [
|
|||
(SYSMO_ISIMSJA5_ALGO_TUAK, 'TUAK'),
|
||||
]
|
||||
|
||||
class SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY:
|
||||
class SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY:
|
||||
"""
|
||||
Superclass model that generates that handles the header byte of
|
||||
SYSMO_ISIMSJA2_EF_USIM_AUTH_KEY, SYSMO_ISIMSJA2_EF_USIM_AUTH_KEY_2G
|
||||
|
@ -139,7 +139,7 @@ class SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY:
|
|||
return out
|
||||
|
||||
|
||||
class SYSMO_ISIMSJAX_FILE_EF_SIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY):
|
||||
class SYSMO_ISIMSJA2_FILE_EF_SIM_AUTH_KEY(SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY):
|
||||
|
||||
key = [0xAA] * 16
|
||||
opc = [0xBB] * 16
|
||||
|
@ -180,7 +180,7 @@ class SYSMO_ISIMSJAX_FILE_EF_SIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY):
|
|||
return out
|
||||
|
||||
|
||||
class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY):
|
||||
class SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY):
|
||||
|
||||
full_res = True # Return full 8-byte RES or first 4 bytes only
|
||||
ext_res = False # Return 16 byte RES (ignores full_res, only valid with 3G XOR)
|
||||
|
@ -192,7 +192,7 @@ class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY)
|
|||
if content == None:
|
||||
return
|
||||
|
||||
SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY.__init__(self, content)
|
||||
SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY.__init__(self, content)
|
||||
header = content[0]
|
||||
|
||||
self.full_res = bool((header >> 6) & 1)
|
||||
|
@ -206,7 +206,7 @@ class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY)
|
|||
dump = ""
|
||||
pfx = " "
|
||||
|
||||
dump += SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY.__str__(self)
|
||||
dump += SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY.__str__(self)
|
||||
if self.full_res == True and self.ext_res == False:
|
||||
dump += pfx + "3G: Return full 8-byte RES\n"
|
||||
elif self.full_res == False and self.ext_res == False:
|
||||
|
@ -235,7 +235,7 @@ class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY)
|
|||
|
||||
|
||||
def encode(self) -> list:
|
||||
out = SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY.encode(self)
|
||||
out = SYSMO_ISIMSJA2_FILE_EF_XSIM_AUTH_KEY.encode(self)
|
||||
if self.full_res == True:
|
||||
out[0] |= 1 << 6
|
||||
if self.ext_res == True:
|
||||
|
@ -250,11 +250,11 @@ class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(SYSMO_ISIMSJAX_FILE_EF_XSIM_AUTH_KEY)
|
|||
|
||||
# EF_USIM_AUTH_KEY_2G and EF_USIM_AUTH_KEY_GBA have the same layout as
|
||||
# EF_USIM_AUTH_KEY, so there is nothing to specialize other than the class name
|
||||
class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY):
|
||||
class SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY):
|
||||
pass
|
||||
|
||||
|
||||
class SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_GBA(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY):
|
||||
class SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_GBA(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY):
|
||||
pass
|
||||
|
||||
|
||||
|
@ -310,7 +310,7 @@ class SYSMO_ISIMSJA2_FILE_EF_MILENAGE_CFG:
|
|||
return out
|
||||
|
||||
|
||||
class SYSMO_ISIMSJAX_FILE_EF_USIM_SQN:
|
||||
class SYSMO_ISIMSJA2_FILE_EF_USIM_SQN:
|
||||
|
||||
# Flag1:
|
||||
ind_size_bits = 5 # speficy file length by 2^ind_len
|
||||
|
@ -485,10 +485,8 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
if card_detected != True:
|
||||
sys.exit(1)
|
||||
|
||||
# Show current milenage parameters
|
||||
def show_milenage_params(self):
|
||||
"""
|
||||
Show current milenage parameters
|
||||
"""
|
||||
print("Reading Milenage parameters...")
|
||||
self._init()
|
||||
|
||||
|
@ -502,10 +500,8 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(str(ef))
|
||||
print("")
|
||||
|
||||
# Write new milenage parameters
|
||||
def write_milenage_params(self, params):
|
||||
"""
|
||||
Write new milenage parameters
|
||||
"""
|
||||
print("Programming Milenage parameters...")
|
||||
|
||||
if (len(params) < 85):
|
||||
|
@ -572,27 +568,27 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_USIM/EF_USIM_AUTH_KEY_2G:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu))
|
||||
|
||||
if self.sim.has_isim:
|
||||
# ADF_ISIM/EF_ISIM_AUTH_KEY_2G:
|
||||
self.__select_xsim_auth_key(isim = True, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_ISIM/EF_ISIM_AUTH_KEY_2G:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu))
|
||||
|
||||
# ADF_USIM/EF_USIM_AUTH_KEY:
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_USIM/EF_USIM_AUTH_KEY:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu))
|
||||
|
||||
if self.sim.has_isim:
|
||||
# ADF_ISIM/EF_ISIM_AUTH_KEY:
|
||||
self.__select_xsim_auth_key(isim = True, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_ISIM/EF_ISIM_AUTH_KEY:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu))
|
||||
|
||||
# ADF_USIM/EF_MILENAGE_CFG:
|
||||
self.sim.select(GSM_SIM_MF)
|
||||
|
@ -617,7 +613,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_USIM/EF_USIM_SQN:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_SQN(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_SQN(res.apdu))
|
||||
|
||||
if self.sim.has_isim:
|
||||
# ADF_USIM/EF_ISIM_SQN:
|
||||
|
@ -626,7 +622,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(" * ADF_ISIM/EF_ISIM_SQN:")
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_SQN(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_SQN(res.apdu))
|
||||
|
||||
def show_key_params(self):
|
||||
"""
|
||||
|
@ -639,7 +635,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" * Reading...")
|
||||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
|
||||
print(" * Current Key setting:")
|
||||
print(" Key: " + hexdump(ef.key))
|
||||
|
@ -656,41 +652,40 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" * Programming...")
|
||||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef.key = key
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.key = key
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
if self.sim.has_isim:
|
||||
self.__select_xsim_auth_key(isim = True, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.key = key
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
print("")
|
||||
|
||||
# Show current athentication parameters
|
||||
# (Which algorithim is used for which rat?)
|
||||
def show_auth_params(self):
|
||||
"""
|
||||
Show current authentication parameters
|
||||
"""
|
||||
print("Reading Authentication parameters...")
|
||||
self._init()
|
||||
|
||||
print(" * Reading...")
|
||||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
algo_2g = ef.algo
|
||||
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
algo_3g = ef.algo
|
||||
|
||||
print(" * Current algorithm setting:")
|
||||
|
@ -698,10 +693,8 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" 3G: %d=%s" % (algo_3g, id_to_str(self.algorithms, algo_3g)))
|
||||
print("")
|
||||
|
||||
# Program new authentication parameters
|
||||
def write_auth_params(self, algo_2g_str, algo_3g_str):
|
||||
"""
|
||||
Write new authentication parameters
|
||||
"""
|
||||
print("Programming Authentication parameters...")
|
||||
self._init()
|
||||
|
||||
|
@ -723,29 +716,27 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
|
||||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef.algo = algo_2g
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.algo = algo_3g
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
if self.sim.has_isim:
|
||||
self.__select_xsim_auth_key(isim = True, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.algo = algo_3g
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
print("")
|
||||
|
||||
# Show current OPc value
|
||||
def show_opc_params(self):
|
||||
"""
|
||||
Show OP/OPc current configuration. (see also method: write_opc_params).
|
||||
"""
|
||||
print("Reading OP/c value...")
|
||||
self._init()
|
||||
|
||||
|
@ -753,7 +744,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" * Reading...")
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
|
||||
if ef.use_opc:
|
||||
mode_str = "OPc"
|
||||
|
@ -764,10 +755,8 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" %s: %s" % (mode_str, hexdump(ef.opc)))
|
||||
print("")
|
||||
|
||||
# Program new OPc value
|
||||
def write_opc_params(self, select, op):
|
||||
"""
|
||||
Program new OPc value
|
||||
"""
|
||||
if select:
|
||||
print("Writing OPc value...")
|
||||
mode_str = "OPc"
|
||||
|
@ -782,7 +771,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
print(" * Programming...")
|
||||
self.__select_xsim_auth_key(isim = False, _2G = True)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY_2G(res.apdu)
|
||||
ef.opc = op
|
||||
ef.use_opc = bool(select)
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
@ -790,24 +779,22 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
if self.sim.has_isim:
|
||||
self.__select_xsim_auth_key(isim = True, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.opc = op
|
||||
ef.use_opc = bool(select)
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
self.__select_xsim_auth_key(isim = False, _2G = False)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_AUTH_KEY(res.apdu)
|
||||
ef.opc = op
|
||||
ef.use_opc = bool(select)
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
print("")
|
||||
|
||||
# Show current milenage SQN parameters
|
||||
def show_milenage_sqn_params(self):
|
||||
"""
|
||||
Show current milenage SQN parameters
|
||||
"""
|
||||
print("Reading Milenage Sequence parameters...")
|
||||
self._init()
|
||||
|
||||
|
@ -816,7 +803,7 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
self.sim.card.SELECT_ADF_USIM()
|
||||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_SQN(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_SQN(res.apdu))
|
||||
|
||||
if self.sim.has_isim:
|
||||
print(" * Current SQN Configuration for ADF_ISIM:")
|
||||
|
@ -824,14 +811,12 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
self.sim.card.SELECT_ADF_ISIM()
|
||||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
res = self._read_binary(self.sim.filelen)
|
||||
print(SYSMO_ISIMSJAX_FILE_EF_USIM_SQN(res.apdu))
|
||||
print(SYSMO_ISIMSJA2_FILE_EF_USIM_SQN(res.apdu))
|
||||
|
||||
print("")
|
||||
|
||||
# Reset milenage SQN configuration
|
||||
def reset_milenage_sqn_params(self):
|
||||
"""
|
||||
Reset milenage SQN configuration
|
||||
"""
|
||||
print(" * Resetting SQN Configuration to defaults...")
|
||||
self._init()
|
||||
|
||||
|
@ -840,13 +825,13 @@ class Sysmo_isim_sja2(Sysmo_usim):
|
|||
|
||||
self.sim.card.SELECT_ADF_USIM()
|
||||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_SQN()
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_SQN()
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
if self.sim.has_isim:
|
||||
self.sim.card.SELECT_ADF_ISIM()
|
||||
self.sim.select(SYSMO_ISIMSJA2_EF_USIM_SQN)
|
||||
ef = SYSMO_ISIMSJAX_FILE_EF_USIM_SQN()
|
||||
ef = SYSMO_ISIMSJA2_FILE_EF_USIM_SQN()
|
||||
self.sim.update_binary(ef.encode())
|
||||
|
||||
print("")
|
||||
|
|
Loading…
Reference in New Issue