Netlink support of extended packet number cipher suites, allows adding and updating XPN macsec interfaces. Added support in: * Creating interfaces with GCM-AES-XPN-128 and GCM-AES-XPN-256 suites. * Setting and getting 64bit packet numbers with of SAs. * Setting (only on SA creation) and getting ssci of SAs. * Setting salt when installing a SAK. Added 2 cipher suite identifiers according to 802.1AE-2018 table 14-1: * MACSEC_CIPHER_ID_GCM_AES_XPN_128 * MACSEC_CIPHER_ID_GCM_AES_XPN_256 In addition, added 2 new netlink attribute types: * MACSEC_SA_ATTR_SSCI * MACSEC_SA_ATTR_SALT Depends on: macsec: Support XPN frame handling - IEEE 802.1AEbw.
Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -22,9 +22,11 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #define MACSEC_KEYID_LEN 16 |
| 24 | 24 | |
| 25 | −/* cipher IDs as per IEEE802.1AEbn-2011 */ | |
| 25 | +/* cipher IDs as per IEEE802.1AE-2018 (Table 14-1) */ | |
| 26 | 26 | #define MACSEC_CIPHER_ID_GCM_AES_128 0x0080C20001000001ULL |
| 27 | 27 | #define MACSEC_CIPHER_ID_GCM_AES_256 0x0080C20001000002ULL |
| 28 | +#define MACSEC_CIPHER_ID_GCM_AES_XPN_128 0x0080C20001000003ULL | |
| 29 | +#define MACSEC_CIPHER_ID_GCM_AES_XPN_256 0x0080C20001000004ULL | |
| 28 | 30 | |
| 29 | 31 | /* deprecated cipher ID for GCM-AES-128 */ |
| 30 | 32 | #define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL |
| @@ -88,11 +90,13 @@ enum macsec_sa_attrs { · 57 unmodified lines | ||
| 88 | 90 | MACSEC_SA_ATTR_UNSPEC, |
| 89 | 91 | MACSEC_SA_ATTR_AN, /* config/dump, u8 0..3 */ |
| 90 | 92 | MACSEC_SA_ATTR_ACTIVE, /* config/dump, u8 0..1 */ |
| 91 | − MACSEC_SA_ATTR_PN, /* config/dump, u32 */ | |
| 93 | + MACSEC_SA_ATTR_PN, /* config/dump, u32/u64 (u64 if XPN) */ | |
| 92 | 94 | MACSEC_SA_ATTR_KEY, /* config, data */ |
| 93 | 95 | MACSEC_SA_ATTR_KEYID, /* config/dump, 128-bit */ |
| 94 | 96 | MACSEC_SA_ATTR_STATS, /* dump, nested, macsec_sa_stats_attr */ |
| 95 | 97 | MACSEC_SA_ATTR_PAD, |
| 98 | + MACSEC_SA_ATTR_SSCI, /* config/dump, u32 - XPN only */ | |
| 99 | + MACSEC_SA_ATTR_SALT, /* config, 96-bit - XPN only */ | |
| 96 | 100 | __MACSEC_SA_ATTR_END, |
| 97 | 101 | NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END, |
| 98 | 102 | MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1, |