<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23706">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-shell: Authenticate (3g) support<br><br>This adds support for AUTHENTICATE to the USIM and ISIM application,<br>based on the newly-introduced 'construct' encoder/decoder support.<br><br>Change-Id: Id5697463e29c3dceff98bcf80f5400f7f2bcaa6c<br>---<br>M docs/shell.rst<br>M pySim/commands.py<br>M pySim/ts_31_102.py<br>M pySim/ts_31_103.py<br>4 files changed, 56 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/06/23706/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/docs/shell.rst b/docs/shell.rst</span><br><span>index 854944c..1072ee8 100644</span><br><span>--- a/docs/shell.rst</span><br><span>+++ b/docs/shell.rst</span><br><span>@@ -300,6 +300,17 @@</span><br><span> This allows for easy interactive modification of file contents.</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+USIM commands</span><br><span style="color: hsl(120, 100%, 40%);">+-------------</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+authenticate</span><br><span style="color: hsl(120, 100%, 40%);">+~~~~~~~~~~~~</span><br><span style="color: hsl(120, 100%, 40%);">+.. argparse::</span><br><span style="color: hsl(120, 100%, 40%);">+ :module: pySim.ts_31_102</span><br><span style="color: hsl(120, 100%, 40%);">+ :func: ADF_USIM.AddlShellCommands.authenticate_parser</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cmd2 settable parameters</span><br><span> ------------------------</span><br><span> </span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 7919099..791b995 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -21,6 +21,8 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> #</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from construct import *</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.construct import LV</span><br><span> from pySim.utils import rpad, b2h, sw_match</span><br><span> from pySim.exceptions import SwMatchError</span><br><span> </span><br><span>@@ -274,6 +276,26 @@</span><br><span> self.select_path(['3f00', '7f20'])</span><br><span> return self._tp.send_apdu(self.cla_byte + '88000010' + rand)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def authenticate(self, rand:str, autn:str, context='3g'):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Execute AUTHENTICATE (USIM/ISIM)."""</span><br><span style="color: hsl(120, 100%, 40%);">+ # 3GPP TS 31.102 Section 7.1.2.1</span><br><span style="color: hsl(120, 100%, 40%);">+ AuthCmd3G = Struct('rand'/LV, 'autn'/Optional(LV))</span><br><span style="color: hsl(120, 100%, 40%);">+ AuthResp3GSyncFail = Struct(Const(b'\xDC'), 'auts'/LV)</span><br><span style="color: hsl(120, 100%, 40%);">+ AuthResp3GSuccess = Struct(Const(b'\xDB'), 'res'/LV, 'ck'/LV, 'ik'/LV, 'kc'/Optional(LV))</span><br><span style="color: hsl(120, 100%, 40%);">+ AuthResp3G = Select(AuthResp3GSyncFail, AuthResp3GSuccess)</span><br><span style="color: hsl(120, 100%, 40%);">+ # build parameters</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_data = {'rand': rand, 'autn': autn}</span><br><span style="color: hsl(120, 100%, 40%);">+ if context == '3g':</span><br><span style="color: hsl(120, 100%, 40%);">+ p2 = '81'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif context == 'gsm':</span><br><span style="color: hsl(120, 100%, 40%);">+ p2 = '80'</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self._tp.send_apdu_constr(self.cla_byte, '88', '00', p2, AuthCmd3G, cmd_data, AuthResp3G)</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'auts' in data:</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = {'synchronisation_failure': data}</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = {'successful_3g_authentication': data}</span><br><span style="color: hsl(120, 100%, 40%);">+ return (ret, sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def reset_card(self):</span><br><span> """Physically reset the card"""</span><br><span> return self._tp.reset_card()</span><br><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index 267008d..cdb6612 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -268,6 +268,7 @@</span><br><span> # ADF.USIM</span><br><span> ######################################################################</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from struct import unpack, pack</span><br><span> from pySim.filesystem import *</span><br><span> from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD</span><br><span> from pySim.ts_51_011 import EF_CBMID, EF_CBMIR</span><br><span>@@ -489,6 +490,8 @@</span><br><span> def __init__(self, aid='a0000000871002', name='ADF.USIM', fid=None, sfid=None,</span><br><span> desc='USIM Application'):</span><br><span> super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc)</span><br><span style="color: hsl(120, 100%, 40%);">+ # add those commands to the general commands of a TransparentEF</span><br><span style="color: hsl(120, 100%, 40%);">+ self.shell_commands += [self.AddlShellCommands()]</span><br><span> </span><br><span> files = [</span><br><span> EF_LI(sfid=0x02),</span><br><span>@@ -520,6 +523,23 @@</span><br><span> def decode_select_response(self, data_hex):</span><br><span> return pySim.ts_102_221.decode_select_response(data_hex)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ @with_default_category('Application-Specific Commands')</span><br><span style="color: hsl(120, 100%, 40%);">+ class AddlShellCommands(CommandSet):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ authenticate_parser = argparse.ArgumentParser()</span><br><span style="color: hsl(120, 100%, 40%);">+ authenticate_parser.add_argument('rand', help='Random challenge')</span><br><span style="color: hsl(120, 100%, 40%);">+ authenticate_parser.add_argument('autn', help='Authentication Nonce')</span><br><span style="color: hsl(120, 100%, 40%);">+ #authenticate_parser.add_argument('--context', help='Authentication context', default='3G')</span><br><span style="color: hsl(120, 100%, 40%);">+ @cmd2.with_argparser(authenticate_parser)</span><br><span style="color: hsl(120, 100%, 40%);">+ def do_authenticate(self, opts):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Perform Authentication and Key Agreement (AKA)."""</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self._cmd.card._scc.authenticate(opts.rand, opts.autn)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput_json(data)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # TS 31.102 Section 7.3</span><br><span> sw_usim = {</span><br><span> 'Security management': {</span><br><span>diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py</span><br><span>index 8209845..effdbf7 100644</span><br><span>--- a/pySim/ts_31_103.py</span><br><span>+++ b/pySim/ts_31_103.py</span><br><span>@@ -25,6 +25,7 @@</span><br><span> from pySim.filesystem import *</span><br><span> from pySim.utils import *</span><br><span> from pySim.ts_51_011 import EF_AD</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_31_102 import ADF_USIM</span><br><span> import pySim.ts_102_221</span><br><span> </span><br><span> # Mapping between ISIM Service Number and its description</span><br><span>@@ -186,6 +187,8 @@</span><br><span> EF_WebRTCURI(),</span><br><span> ]</span><br><span> self.add_files(files)</span><br><span style="color: hsl(120, 100%, 40%);">+ # add those commands to the general commands of a TransparentEF</span><br><span style="color: hsl(120, 100%, 40%);">+ self.shell_commands += [ADF_USIM.AddlShellCommands()]</span><br><span> </span><br><span> def decode_select_response(self, data_hex):</span><br><span> return pySim.ts_102_221.decode_select_response(data_hex)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23706">change 23706</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/+/23706"/><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: Id5697463e29c3dceff98bcf80f5400f7f2bcaa6c </div>
<div style="display:none"> Gerrit-Change-Number: 23706 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>