<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23710">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ts_31_102.py: switch EF.Keys from imperative to declarative codec<br><br>Change-Id: I215a61c1e44ee2c5df70a8ca96344b4dd4d93c00<br>---<br>M pySim/ts_31_102.py<br>1 file changed, 3 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/10/23710/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index cdb6612..320a2cd 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -269,6 +269,8 @@</span><br><span> ######################################################################</span><br><span> </span><br><span> from struct import unpack, pack</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 HexAdapter</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>@@ -416,12 +418,7 @@</span><br><span>     def __init__(self, fid='6f08', sfid=0x08, name='EF.Keys', size={33,33},</span><br><span>                  desc='Ciphering and Integrity Keys'):</span><br><span>         super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size)</span><br><span style="color: hsl(0, 100%, 40%);">-    def _decode_bin(self, in_bin):</span><br><span style="color: hsl(0, 100%, 40%);">-        return {'ksi': in_bin[0],</span><br><span style="color: hsl(0, 100%, 40%);">-                'ck': b2h(in_bin[1:17]),</span><br><span style="color: hsl(0, 100%, 40%);">-                'ik': b2h(in_bin[17:33])}</span><br><span style="color: hsl(0, 100%, 40%);">-    def _encode_bin(self, in_json):</span><br><span style="color: hsl(0, 100%, 40%);">-        return h2b(in_json['ksi']) + h2b(in_json['ck']) + h2b(in_json['ik'])</span><br><span style="color: hsl(120, 100%, 40%);">+        self._construct = Struct('ksi'/Int8ub, 'ck'/HexAdapter(Bytes(16)), 'ik'/HexAdapter(Bytes(16)))</span><br><span> </span><br><span> # TS 31.103 Section 4.2.7</span><br><span> class EF_UST(TransparentEF):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23710">change 23710</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/+/23710"/><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: I215a61c1e44ee2c5df70a8ca96344b4dd4d93c00 </div>
<div style="display:none"> Gerrit-Change-Number: 23710 </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>