<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9880">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniffing: fix procedure byte handling and make TPDU parsing for strict<br><br>Change-Id: If991152f11c4b864ab1386f21dc13c335e6b281f<br>---<br>M firmware/libcommon/source/sniffer.c<br>1 file changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/80/9880/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index c14a176..3719796 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -176,7 +176,7 @@</span><br><span>  */</span><br><span> uint8_t tpdu_packet[5+256+2];</span><br><span> /*! Current index in TPDU packet */</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t tpdu_packet_i = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t tpdu_packet_i = 0;</span><br><span> </span><br><span> /*------------------------------------------------------------------------------</span><br><span>  *         Internal functions</span><br><span>@@ -625,13 +625,19 @@</span><br><span>         case TPDU_S_CLA:</span><br><span>             if (0xff==byte) {</span><br><span>                    TRACE_WARNING("0xff is not a valid class byte\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">-                  break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            tpdu_packet_i = 0;</span><br><span>           tpdu_packet[tpdu_packet_i++] = byte;</span><br><span>                 tpdu_state = TPDU_S_INS;</span><br><span>             break;</span><br><span>       case TPDU_S_INS:</span><br><span style="color: hsl(120, 100%, 40%);">+              if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);</span><br><span style="color: hsl(120, 100%, 40%);">+                      change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span>            tpdu_packet_i = 1;</span><br><span>           tpdu_packet[tpdu_packet_i++] = byte;</span><br><span>                 tpdu_state = TPDU_S_P1;</span><br><span>@@ -667,6 +673,8 @@</span><br><span>                        tpdu_state = TPDU_S_SW2;</span><br><span>             } else {</span><br><span>                     TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);</span><br><span style="color: hsl(120, 100%, 40%);">+                      change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            break;</span><br><span>       case TPDU_S_SW2:</span><br><span>@@ -679,11 +687,11 @@</span><br><span>             tpdu_packet[tpdu_packet_i++] = byte;</span><br><span>                 if (0==tpdu_packet[4]) {</span><br><span>                     if (5+256<=tpdu_packet_i) {</span><br><span style="color: hsl(0, 100%, 40%);">-                          tpdu_state = TPDU_S_SW1;</span><br><span style="color: hsl(120, 100%, 40%);">+                              tpdu_state = TPDU_S_PROCEDURE;</span><br><span>                       }</span><br><span>            } else {</span><br><span>                     if (5+tpdu_packet[4]<=tpdu_packet_i) {</span><br><span style="color: hsl(0, 100%, 40%);">-                               tpdu_state = TPDU_S_SW1;</span><br><span style="color: hsl(120, 100%, 40%);">+                              tpdu_state = TPDU_S_PROCEDURE;</span><br><span>                       }</span><br><span>            }</span><br><span>            if (TPDU_S_DATA_SINGLE==tpdu_state) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9880">change 9880</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/9880"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If991152f11c4b864ab1386f21dc13c335e6b281f </div>
<div style="display:none"> Gerrit-Change-Number: 9880 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>