Skip to content

Commit e0153ff

Browse files
committed
linux: add missing tls bindings
sort semver/linux.txt properly
1 parent 10ef8ab commit e0153ff

File tree

2 files changed

+135
-0
lines changed

2 files changed

+135
-0
lines changed

libc-test/semver/linux.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3346,6 +3346,12 @@ TLS_1_2_VERSION_MINOR
33463346
TLS_1_3_VERSION
33473347
TLS_1_3_VERSION_MAJOR
33483348
TLS_1_3_VERSION_MINOR
3349+
TLS_CIPHER_AES_CCM_128
3350+
TLS_CIPHER_AES_CCM_128_IV_SIZE
3351+
TLS_CIPHER_AES_CCM_128_KEY_SIZE
3352+
TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE
3353+
TLS_CIPHER_AES_CCM_128_SALT_SIZE
3354+
TLS_CIPHER_AES_CCM_128_TAG_SIZE
33493355
TLS_CIPHER_AES_GCM_128
33503356
TLS_CIPHER_AES_GCM_128_IV_SIZE
33513357
TLS_CIPHER_AES_GCM_128_KEY_SIZE
@@ -3358,16 +3364,53 @@ TLS_CIPHER_AES_GCM_256_KEY_SIZE
33583364
TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE
33593365
TLS_CIPHER_AES_GCM_256_SALT_SIZE
33603366
TLS_CIPHER_AES_GCM_256_TAG_SIZE
3367+
TLS_CIPHER_ARIA_GCM_128
3368+
TLS_CIPHER_ARIA_GCM_128_IV_SIZE
3369+
TLS_CIPHER_ARIA_GCM_128_KEY_SIZE
3370+
TLS_CIPHER_ARIA_GCM_128_REC_SEQ_SIZE
3371+
TLS_CIPHER_ARIA_GCM_128_SALT_SIZE
3372+
TLS_CIPHER_ARIA_GCM_128_TAG_SIZE
3373+
TLS_CIPHER_ARIA_GCM_256
3374+
TLS_CIPHER_ARIA_GCM_256_IV_SIZE
3375+
TLS_CIPHER_ARIA_GCM_256_KEY_SIZE
3376+
TLS_CIPHER_ARIA_GCM_256_REC_SEQ_SIZE
3377+
TLS_CIPHER_ARIA_GCM_256_SALT_SIZE
3378+
TLS_CIPHER_ARIA_GCM_256_TAG_SIZE
33613379
TLS_CIPHER_CHACHA20_POLY1305
33623380
TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE
33633381
TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE
33643382
TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE
33653383
TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE
33663384
TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE
3385+
TLS_CIPHER_SM4_CCM
3386+
TLS_CIPHER_SM4_CCM_IV_SIZE
3387+
TLS_CIPHER_SM4_CCM_KEY_SIZE
3388+
TLS_CIPHER_SM4_CCM_REC_SEQ_SIZE
3389+
TLS_CIPHER_SM4_CCM_SALT_SIZE
3390+
TLS_CIPHER_SM4_CCM_TAG_SIZE
3391+
TLS_CIPHER_SM4_GCM
3392+
TLS_CIPHER_SM4_GCM_IV_SIZE
3393+
TLS_CIPHER_SM4_GCM_KEY_SIZE
3394+
TLS_CIPHER_SM4_GCM_REC_SEQ_SIZE
3395+
TLS_CIPHER_SM4_GCM_SALT_SIZE
3396+
TLS_CIPHER_SM4_GCM_TAG_SIZE
3397+
TLS_CONF_BASE
3398+
TLS_CONF_HW
3399+
TLS_CONF_HW_RECORD
3400+
TLS_CONF_SW
33673401
TLS_GET_RECORD_TYPE
3402+
TLS_INFO_CIPHER
3403+
TLS_INFO_RXCONF
3404+
TLS_INFO_RX_NO_PAD
3405+
TLS_INFO_TXCONF
3406+
TLS_INFO_UNSPEC
3407+
TLS_INFO_VERSION
3408+
TLS_INFO_ZC_RO_TX
33683409
TLS_RX
3410+
TLS_RX_EXPECT_NO_PAD
33693411
TLS_SET_RECORD_TYPE
33703412
TLS_TX
3413+
TLS_TX_ZEROCOPY_RO
33713414
TP_STATUS_AVAILABLE
33723415
TP_STATUS_BLK_TMO
33733416
TP_STATUS_COPY

src/unix/linux_like/linux/mod.rs

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,14 @@ s! {
966966
pub rec_seq: [c_uchar; TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE],
967967
}
968968

969+
pub struct tls12_crypto_info_aes_ccm_128 {
970+
pub info: tls_crypto_info,
971+
pub iv: [c_uchar; TLS_CIPHER_AES_CCM_128_IV_SIZE],
972+
pub key: [c_uchar; TLS_CIPHER_AES_CCM_128_KEY_SIZE],
973+
pub salt: [c_uchar; TLS_CIPHER_AES_CCM_128_SALT_SIZE],
974+
pub rec_seq: [c_uchar; TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE],
975+
}
976+
969977
pub struct tls12_crypto_info_chacha20_poly1305 {
970978
pub info: tls_crypto_info,
971979
pub iv: [c_uchar; TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE],
@@ -974,6 +982,38 @@ s! {
974982
pub rec_seq: [c_uchar; TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE],
975983
}
976984

985+
pub struct tls12_crypto_info_sm4_gcm {
986+
pub info: tls_crypto_info,
987+
pub iv: [c_uchar; TLS_CIPHER_SM4_GCM_IV_SIZE],
988+
pub key: [c_uchar; TLS_CIPHER_SM4_GCM_KEY_SIZE],
989+
pub salt: [c_uchar; TLS_CIPHER_SM4_GCM_SALT_SIZE],
990+
pub rec_seq: [c_uchar; TLS_CIPHER_SM4_GCM_REC_SEQ_SIZE],
991+
}
992+
993+
pub struct tls12_crypto_info_sm4_ccm {
994+
pub info: tls_crypto_info,
995+
pub iv: [c_uchar; TLS_CIPHER_SM4_CCM_IV_SIZE],
996+
pub key: [c_uchar; TLS_CIPHER_SM4_CCM_KEY_SIZE],
997+
pub salt: [c_uchar; TLS_CIPHER_SM4_CCM_SALT_SIZE],
998+
pub rec_seq: [c_uchar; TLS_CIPHER_SM4_CCM_REC_SEQ_SIZE],
999+
}
1000+
1001+
pub struct tls12_crypto_info_aria_gcm_128 {
1002+
pub info: tls_crypto_info,
1003+
pub iv: [c_uchar; TLS_CIPHER_ARIA_GCM_128_IV_SIZE],
1004+
pub key: [c_uchar; TLS_CIPHER_ARIA_GCM_128_KEY_SIZE],
1005+
pub salt: [c_uchar; TLS_CIPHER_ARIA_GCM_128_SALT_SIZE],
1006+
pub rec_seq: [c_uchar; TLS_CIPHER_ARIA_GCM_128_REC_SEQ_SIZE],
1007+
}
1008+
1009+
pub struct tls12_crypto_info_aria_gcm_256 {
1010+
pub info: tls_crypto_info,
1011+
pub iv: [c_uchar; TLS_CIPHER_ARIA_GCM_256_IV_SIZE],
1012+
pub key: [c_uchar; TLS_CIPHER_ARIA_GCM_256_KEY_SIZE],
1013+
pub salt: [c_uchar; TLS_CIPHER_ARIA_GCM_256_SALT_SIZE],
1014+
pub rec_seq: [c_uchar; TLS_CIPHER_ARIA_GCM_256_REC_SEQ_SIZE],
1015+
}
1016+
9771017
// linux/wireless.h
9781018

9791019
pub struct iw_param {
@@ -4658,6 +4698,9 @@ pub const PTP_PF_PHYSYNC: c_uint = 3;
46584698
pub const TLS_TX: c_int = 1;
46594699
pub const TLS_RX: c_int = 2;
46604700

4701+
pub const TLS_TX_ZEROCOPY_RO: c_int = 3;
4702+
pub const TLS_RX_EXPECT_NO_PAD: c_int = 4;
4703+
46614704
pub const TLS_1_2_VERSION_MAJOR: __u8 = 0x3;
46624705
pub const TLS_1_2_VERSION_MINOR: __u8 = 0x3;
46634706
pub const TLS_1_2_VERSION: __u16 =
@@ -4682,18 +4725,67 @@ pub const TLS_CIPHER_AES_GCM_256_SALT_SIZE: usize = 4;
46824725
pub const TLS_CIPHER_AES_GCM_256_TAG_SIZE: usize = 16;
46834726
pub const TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE: usize = 8;
46844727

4728+
pub const TLS_CIPHER_AES_CCM_128: __u16 = 53;
4729+
pub const TLS_CIPHER_AES_CCM_128_IV_SIZE: usize = 8;
4730+
pub const TLS_CIPHER_AES_CCM_128_KEY_SIZE: usize = 16;
4731+
pub const TLS_CIPHER_AES_CCM_128_SALT_SIZE: usize = 4;
4732+
pub const TLS_CIPHER_AES_CCM_128_TAG_SIZE: usize = 16;
4733+
pub const TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE: usize = 8;
4734+
46854735
pub const TLS_CIPHER_CHACHA20_POLY1305: __u16 = 54;
46864736
pub const TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE: usize = 12;
46874737
pub const TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE: usize = 32;
46884738
pub const TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE: usize = 0;
46894739
pub const TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE: usize = 16;
46904740
pub const TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE: usize = 8;
46914741

4742+
pub const TLS_CIPHER_SM4_GCM: __u16 = 55;
4743+
pub const TLS_CIPHER_SM4_GCM_IV_SIZE: usize = 8;
4744+
pub const TLS_CIPHER_SM4_GCM_KEY_SIZE: usize = 16;
4745+
pub const TLS_CIPHER_SM4_GCM_SALT_SIZE: usize = 4;
4746+
pub const TLS_CIPHER_SM4_GCM_TAG_SIZE: usize = 16;
4747+
pub const TLS_CIPHER_SM4_GCM_REC_SEQ_SIZE: usize = 8;
4748+
4749+
pub const TLS_CIPHER_SM4_CCM: __u16 = 56;
4750+
pub const TLS_CIPHER_SM4_CCM_IV_SIZE: usize = 8;
4751+
pub const TLS_CIPHER_SM4_CCM_KEY_SIZE: usize = 16;
4752+
pub const TLS_CIPHER_SM4_CCM_SALT_SIZE: usize = 4;
4753+
pub const TLS_CIPHER_SM4_CCM_TAG_SIZE: usize = 16;
4754+
pub const TLS_CIPHER_SM4_CCM_REC_SEQ_SIZE: usize = 8;
4755+
4756+
pub const TLS_CIPHER_ARIA_GCM_128: __u16 = 57;
4757+
pub const TLS_CIPHER_ARIA_GCM_128_IV_SIZE: usize = 8;
4758+
pub const TLS_CIPHER_ARIA_GCM_128_KEY_SIZE: usize = 16;
4759+
pub const TLS_CIPHER_ARIA_GCM_128_SALT_SIZE: usize = 4;
4760+
pub const TLS_CIPHER_ARIA_GCM_128_TAG_SIZE: usize = 16;
4761+
pub const TLS_CIPHER_ARIA_GCM_128_REC_SEQ_SIZE: usize = 8;
4762+
4763+
pub const TLS_CIPHER_ARIA_GCM_256: __u16 = 58;
4764+
pub const TLS_CIPHER_ARIA_GCM_256_IV_SIZE: usize = 8;
4765+
pub const TLS_CIPHER_ARIA_GCM_256_KEY_SIZE: usize = 32;
4766+
pub const TLS_CIPHER_ARIA_GCM_256_SALT_SIZE: usize = 4;
4767+
pub const TLS_CIPHER_ARIA_GCM_256_TAG_SIZE: usize = 16;
4768+
pub const TLS_CIPHER_ARIA_GCM_256_REC_SEQ_SIZE: usize = 8;
4769+
46924770
pub const TLS_SET_RECORD_TYPE: c_int = 1;
46934771
pub const TLS_GET_RECORD_TYPE: c_int = 2;
46944772

46954773
pub const SOL_TLS: c_int = 282;
46964774

4775+
// enum
4776+
pub const TLS_INFO_UNSPEC: c_int = 0x00;
4777+
pub const TLS_INFO_VERSION: c_int = 0x01;
4778+
pub const TLS_INFO_CIPHER: c_int = 0x02;
4779+
pub const TLS_INFO_TXCONF: c_int = 0x03;
4780+
pub const TLS_INFO_RXCONF: c_int = 0x04;
4781+
pub const TLS_INFO_ZC_RO_TX: c_int = 0x05;
4782+
pub const TLS_INFO_RX_NO_PAD: c_int = 0x06;
4783+
4784+
pub const TLS_CONF_BASE: c_int = 1;
4785+
pub const TLS_CONF_SW: c_int = 2;
4786+
pub const TLS_CONF_HW: c_int = 3;
4787+
pub const TLS_CONF_HW_RECORD: c_int = 4;
4788+
46974789
// linux/if_alg.h
46984790
pub const ALG_SET_KEY: c_int = 1;
46994791
pub const ALG_SET_IV: c_int = 2;

0 commit comments

Comments
 (0)