Skip to content

Commit 71a515e

Browse files
authored
[iproute2]: Fix format error of SSCI (#10767)
Signed-off-by: Ze Gan <ganze718@gmail.com> #### Why I did it The SSCI is wrong in the output of MACsec so that the virtual SAI cannot parse the output corretly. The wrong output: ``` 142: macsec_eth1: protect on validate strict sc off sa off encrypt on send_sci on end_station off scb off replay off cipher suite: GCM-AES-XPN-256, using ICV length 16 TXSC: 5254008f4f1c0001 on SA 0 0: PN 103, state on, key 12cbc4b64e26c9a1ba14d810da20d16e SSCI 33554432, RXSC: 525400edac5b0001, state on 0: PN 107, state on, key 12cbc4b64e26c9a1ba14d810da20d16e offload: off ``` Expected ``` 142: macsec_eth1: protect on validate strict sc off sa off encrypt on send_sci on end_station off scb off replay off cipher suite: GCM-AES-XPN-256, using ICV length 16 TXSC: 5254008f4f1c0001 on SA 0 0: PN 252, state on, SSCI 33554432, key 12cbc4b64e26c9a1ba14d810da20d16e RXSC: 525400edac5b0001, state on 0: PN 264, state on, key 12cbc4b64e26c9a1ba14d810da20d16e ``` #### How I did it Move SSCI before the key so that SSCI will not be the front of SC information.
1 parent d5a182f commit 71a515e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/iproute2/patch/0001-patch-macsec-xpn-support.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ index 18289ecd..1df19bf1 100644
182182
print_bool(PRINT_JSON, "active", NULL, state);
183183
print_string(PRINT_FP, NULL,
184184
" state %s,", state ? "on" : "off");
185-
print_key(sa_attr[MACSEC_SA_ATTR_KEYID]);
186185
+ if (sa_attr[MACSEC_SA_ATTR_SSCI]) {
187186
+ print_uint(PRINT_ANY, "ssci", " SSCI %u,",
188187
+ rta_getattr_u32(sa_attr[MACSEC_SA_ATTR_SSCI]));
189188
+ }
189+
print_key(sa_attr[MACSEC_SA_ATTR_KEYID]);
190190

191191
print_txsa_stats(prefix, sa_attr[MACSEC_SA_ATTR_STATS]);
192192
close_json_object();

0 commit comments

Comments
 (0)