Skip to content

Commit 79d195b

Browse files
borsbors
committed
Auto merge of #3422 - Arnavion:ktls, r=JohnTitor
Add more definitions from linux/tls.h
2 parents d0ce87b + fbcacd0 commit 79d195b

File tree

3 files changed

+145
-1
lines changed

3 files changed

+145
-1
lines changed

‎libc-test/build.rs

+52-1
Original file line numberDiff line numberDiff line change
@@ -3221,6 +3221,7 @@ fn test_linux(target: &str) {
32213221
}
32223222

32233223
let arm = target.contains("arm");
3224+
let aarch64 = target.contains("aarch64");
32243225
let i686 = target.contains("i686");
32253226
let mips = target.contains("mips");
32263227
let mips32 = mips && !target.contains("64");
@@ -3232,7 +3233,7 @@ fn test_linux(target: &str) {
32323233
let x32 = target.contains("x32");
32333234
let x86_32 = target.contains("i686");
32343235
let x86_64 = target.contains("x86_64");
3235-
let aarch64_musl = target.contains("aarch64") && musl;
3236+
let aarch64_musl = aarch64 && musl;
32363237
let gnueabihf = target.contains("gnueabihf");
32373238
let x86_64_gnux32 = target.contains("gnux32") && x86_64;
32383239
let riscv64 = target.contains("riscv64");
@@ -3591,6 +3592,25 @@ fn test_linux(target: &str) {
35913592
// FIXME: The size of `iv` has been changed since Linux v6.0
35923593
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
35933594
"af_alg_iv" => true,
3595+
3596+
// FIXME: Requires >= 5.1 kernel headers.
3597+
// Everything that uses install-musl.sh has 4.19 kernel headers.
3598+
"tls12_crypto_info_aes_gcm_256"
3599+
if (aarch64 || arm || i686 || mips64 || s390x || x86_64) && musl =>
3600+
{
3601+
true
3602+
}
3603+
3604+
// FIXME: Requires >= 5.11 kernel headers.
3605+
// Everything that uses install-musl.sh has 4.19 kernel headers.
3606+
// mips-unknown-linux-musl and mips64-unknown-linux-musl use
3607+
// openwrt-sdk which has 5.4 kernel headers.
3608+
"tls12_crypto_info_chacha20_poly1305"
3609+
if (aarch64 || arm || i686 || mips || s390x || x86_64) && musl =>
3610+
{
3611+
true
3612+
}
3613+
35943614
_ => false,
35953615
}
35963616
});
@@ -3915,6 +3935,37 @@ fn test_linux(target: &str) {
39153935
// FIXME: Requires linux 6.5
39163936
"NFT_MSG_MAX" => true,
39173937

3938+
// FIXME: Requires >= 5.1 kernel headers.
3939+
// Everything that uses install-musl.sh has 4.19 kernel headers.
3940+
"TLS_1_3_VERSION"
3941+
| "TLS_1_3_VERSION_MAJOR"
3942+
| "TLS_1_3_VERSION_MINOR"
3943+
| "TLS_CIPHER_AES_GCM_256"
3944+
| "TLS_CIPHER_AES_GCM_256_IV_SIZE"
3945+
| "TLS_CIPHER_AES_GCM_256_KEY_SIZE"
3946+
| "TLS_CIPHER_AES_GCM_256_SALT_SIZE"
3947+
| "TLS_CIPHER_AES_GCM_256_TAG_SIZE"
3948+
| "TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE"
3949+
if (aarch64 || arm || i686 || mips64 || s390x || x86_64) && musl =>
3950+
{
3951+
true
3952+
}
3953+
3954+
// FIXME: Requires >= 5.11 kernel headers.
3955+
// Everything that uses install-musl.sh has 4.19 kernel headers.
3956+
// mips-unknown-linux-musl and mips64-unknown-linux-musl use
3957+
// openwrt-sdk which has 5.4 kernel headers.
3958+
"TLS_CIPHER_CHACHA20_POLY1305"
3959+
| "TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE"
3960+
| "TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE"
3961+
| "TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE"
3962+
| "TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE"
3963+
| "TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE"
3964+
if (aarch64 || arm || i686 || mips || s390x || x86_64) && musl =>
3965+
{
3966+
true
3967+
}
3968+
39183969
_ => false,
39193970
}
39203971
});

‎libc-test/semver/linux.txt

+27
Original file line numberDiff line numberDiff line change
@@ -2910,7 +2910,34 @@ TIOCSCTTY
29102910
TIOCSPGRP
29112911
TIOCSSOFTCAR
29122912
TIOCSTI
2913+
TLS_1_2_VERSION
2914+
TLS_1_2_VERSION_MAJOR
2915+
TLS_1_2_VERSION_MINOR
2916+
TLS_1_3_VERSION
2917+
TLS_1_3_VERSION_MAJOR
2918+
TLS_1_3_VERSION_MINOR
2919+
TLS_CIPHER_AES_GCM_128
2920+
TLS_CIPHER_AES_GCM_128_IV_SIZE
2921+
TLS_CIPHER_AES_GCM_128_KEY_SIZE
2922+
TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE
2923+
TLS_CIPHER_AES_GCM_128_SALT_SIZE
2924+
TLS_CIPHER_AES_GCM_128_TAG_SIZE
2925+
TLS_CIPHER_AES_GCM_256
2926+
TLS_CIPHER_AES_GCM_256_IV_SIZE
2927+
TLS_CIPHER_AES_GCM_256_KEY_SIZE
2928+
TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE
2929+
TLS_CIPHER_AES_GCM_256_SALT_SIZE
2930+
TLS_CIPHER_AES_GCM_256_TAG_SIZE
2931+
TLS_CIPHER_CHACHA20_POLY1305
2932+
TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE
2933+
TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE
2934+
TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE
2935+
TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE
2936+
TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE
29132937
TLS_GET_RECORD_TYPE
2938+
TLS_RX
2939+
TLS_SET_RECORD_TYPE
2940+
TLS_TX
29142941
TUN_READQ_SIZE
29152942
TUN_TAP_DEV
29162943
TUN_TUN_DEV

‎src/unix/linux_like/linux/mod.rs

+66
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,37 @@ s! {
686686
pub rlim_cur: rlim64_t,
687687
pub rlim_max: rlim64_t,
688688
}
689+
690+
// linux/tls.h
691+
692+
pub struct tls_crypto_info {
693+
pub version: ::__u16,
694+
pub cipher_type: ::__u16,
695+
}
696+
697+
pub struct tls12_crypto_info_aes_gcm_128 {
698+
pub info: tls_crypto_info,
699+
pub iv: [::c_uchar; TLS_CIPHER_AES_GCM_128_IV_SIZE],
700+
pub key: [::c_uchar; TLS_CIPHER_AES_GCM_128_KEY_SIZE],
701+
pub salt: [::c_uchar; TLS_CIPHER_AES_GCM_128_SALT_SIZE],
702+
pub rec_seq: [::c_uchar; TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE],
703+
}
704+
705+
pub struct tls12_crypto_info_aes_gcm_256 {
706+
pub info: tls_crypto_info,
707+
pub iv: [::c_uchar; TLS_CIPHER_AES_GCM_256_IV_SIZE],
708+
pub key: [::c_uchar; TLS_CIPHER_AES_GCM_256_KEY_SIZE],
709+
pub salt: [::c_uchar; TLS_CIPHER_AES_GCM_256_SALT_SIZE],
710+
pub rec_seq: [::c_uchar; TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE],
711+
}
712+
713+
pub struct tls12_crypto_info_chacha20_poly1305 {
714+
pub info: tls_crypto_info,
715+
pub iv: [::c_uchar; TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE],
716+
pub key: [::c_uchar; TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE],
717+
pub salt: [::c_uchar; TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE],
718+
pub rec_seq: [::c_uchar; TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE],
719+
}
689720
}
690721

691722
s_no_extra_traits! {
@@ -3238,6 +3269,41 @@ pub const HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: ::c_uint = 14;
32383269
pub const HWTSTAMP_FILTER_NTP_ALL: ::c_uint = 15;
32393270

32403271
// linux/tls.h
3272+
pub const TLS_TX: ::c_int = 1;
3273+
pub const TLS_RX: ::c_int = 2;
3274+
3275+
pub const TLS_1_2_VERSION_MAJOR: ::__u8 = 0x3;
3276+
pub const TLS_1_2_VERSION_MINOR: ::__u8 = 0x3;
3277+
pub const TLS_1_2_VERSION: ::__u16 =
3278+
((TLS_1_2_VERSION_MAJOR as ::__u16) << 8) | (TLS_1_2_VERSION_MINOR as ::__u16);
3279+
3280+
pub const TLS_1_3_VERSION_MAJOR: ::__u8 = 0x3;
3281+
pub const TLS_1_3_VERSION_MINOR: ::__u8 = 0x4;
3282+
pub const TLS_1_3_VERSION: ::__u16 =
3283+
((TLS_1_3_VERSION_MAJOR as ::__u16) << 8) | (TLS_1_3_VERSION_MINOR as ::__u16);
3284+
3285+
pub const TLS_CIPHER_AES_GCM_128: ::__u16 = 51;
3286+
pub const TLS_CIPHER_AES_GCM_128_IV_SIZE: usize = 8;
3287+
pub const TLS_CIPHER_AES_GCM_128_KEY_SIZE: usize = 16;
3288+
pub const TLS_CIPHER_AES_GCM_128_SALT_SIZE: usize = 4;
3289+
pub const TLS_CIPHER_AES_GCM_128_TAG_SIZE: usize = 16;
3290+
pub const TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE: usize = 8;
3291+
3292+
pub const TLS_CIPHER_AES_GCM_256: ::__u16 = 52;
3293+
pub const TLS_CIPHER_AES_GCM_256_IV_SIZE: usize = 8;
3294+
pub const TLS_CIPHER_AES_GCM_256_KEY_SIZE: usize = 32;
3295+
pub const TLS_CIPHER_AES_GCM_256_SALT_SIZE: usize = 4;
3296+
pub const TLS_CIPHER_AES_GCM_256_TAG_SIZE: usize = 16;
3297+
pub const TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE: usize = 8;
3298+
3299+
pub const TLS_CIPHER_CHACHA20_POLY1305: ::__u16 = 54;
3300+
pub const TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE: usize = 12;
3301+
pub const TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE: usize = 32;
3302+
pub const TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE: usize = 0;
3303+
pub const TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE: usize = 16;
3304+
pub const TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE: usize = 8;
3305+
3306+
pub const TLS_SET_RECORD_TYPE: ::c_int = 1;
32413307
pub const TLS_GET_RECORD_TYPE: ::c_int = 2;
32423308

32433309
pub const SOL_TLS: ::c_int = 282;

0 commit comments

Comments
 (0)