diff options
author | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2018-01-11 13:06:43 +0900 |
---|---|---|
committer | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2018-01-11 13:06:43 +0900 |
commit | 19fffa1db760cca15a2689695f3cc14be1933513 (patch) | |
tree | 08668f1cca905c8579ebbb6b5e98d56fb7fac5c5 | |
parent | e0d9d88cd57a50b30787a388b1fd56562b078554 (diff) |
Make derive_milenage_opc and calculate_luhn publicly available through utils.py
Change-Id: I2effc85fd55da0981de0ada74dcb28b7e8e56a01
-rwxr-xr-x | pySim-prog.py | 20 | ||||
-rw-r--r-- | pySim/utils.py | 21 |
2 files changed, 22 insertions, 19 deletions
diff --git a/pySim-prog.py b/pySim-prog.py index 44ca1fd..c08f43b 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -39,7 +39,7 @@ except ImportError: from pySim.commands import SimCardCommands from pySim.cards import _cards_classes -from pySim.utils import h2b, swap_nibbles, rpad +from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn def parse_options(): @@ -234,24 +234,6 @@ def _dbi_binary_quote(s): return ''.join(out) -def calculate_luhn(cc): - num = map(int, str(cc)) - check_digit = 10 - sum(num[-2::-2] + [sum(divmod(d * 2, 10)) for d in num[::-2]]) % 10 - return 0 if check_digit == 10 else check_digit - -def derive_milenage_opc(ki_hex, op_hex): - """ - Run the milenage algorithm. - """ - from Crypto.Cipher import AES - from Crypto.Util.strxor import strxor - from pySim.utils import b2h - - # We pass in hex string and now need to work on bytes - aes = AES.new(h2b(ki_hex)) - opc_bytes = aes.encrypt(h2b(op_hex)) - return b2h(strxor(opc_bytes, h2b(op_hex))) - def gen_parameters(opts): """Generates Name, ICCID, MCC, MNC, IMSI, SMSP, Ki, PIN-ADM from the options given by the user""" diff --git a/pySim/utils.py b/pySim/utils.py index 43d52dd..17dc693 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -92,3 +92,24 @@ def enc_spn(name, hplmn_disp=False, oplmn_disp=False): if hplmn_disp: byte1 = byte1|0x01 if oplmn_disp: byte1 = byte1|0x02 return i2h([byte1])+s2h(name) + +def derive_milenage_opc(ki_hex, op_hex): + """ + Run the milenage algorithm to calculate OPC from Ki and OP + """ + from Crypto.Cipher import AES + from Crypto.Util.strxor import strxor + from pySim.utils import b2h + + # We pass in hex string and now need to work on bytes + aes = AES.new(h2b(ki_hex)) + opc_bytes = aes.encrypt(h2b(op_hex)) + return b2h(strxor(opc_bytes, h2b(op_hex))) + +def calculate_luhn(cc): + """ + Calculate Luhn checksum used in e.g. ICCID and IMEI + """ + num = map(int, str(cc)) + check_digit = 10 - sum(num[-2::-2] + [sum(divmod(d * 2, 10)) for d in num[::-2]]) % 10 + return 0 if check_digit == 10 else check_digit |