mirror of
https://github.com/telemt/telemt.git
synced 2026-11-22 07:16:38 +03:00
Merge pull request #966 from AndreyOsipuk/fix/emulated-record-marker
Randomize the inner content type byte in emulated TLS ApplicationData
This commit is contained in:
@@ -508,21 +508,13 @@ pub fn build_emulated_server_hello(
|
||||
rec.extend_from_slice(&payload[payload_offset..payload_offset + copy_len]);
|
||||
payload_offset += copy_len;
|
||||
}
|
||||
if body_len > copy_len {
|
||||
rec.extend_from_slice(&rng.bytes(body_len - copy_len));
|
||||
}
|
||||
rec.push(0x16);
|
||||
rec.extend_from_slice(&rng.bytes(16));
|
||||
// The 17-byte tail stands in for the encrypted inner content
|
||||
// type and AEAD tag. Both are ciphertext in real TLS 1.3, so a
|
||||
// fixed plaintext content type byte would be a stable marker.
|
||||
rec.extend_from_slice(&rng.bytes(body_len - copy_len + 17));
|
||||
} else {
|
||||
rec.extend_from_slice(&rng.bytes(size));
|
||||
}
|
||||
} else if size > 17 {
|
||||
let body_len = size - 17;
|
||||
let mut body = Vec::with_capacity(body_len);
|
||||
body.extend_from_slice(&rng.bytes(body_len));
|
||||
rec.extend_from_slice(&body);
|
||||
rec.push(0x16);
|
||||
rec.extend_from_slice(&rng.bytes(16));
|
||||
} else {
|
||||
rec.extend_from_slice(&rng.bytes(size));
|
||||
}
|
||||
@@ -887,7 +879,6 @@ mod tests {
|
||||
|
||||
let payload = first_app_data_payload(&response);
|
||||
assert!(payload.len() >= 64);
|
||||
assert_eq!(payload[payload.len() - 17], 0x16);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
use std::collections::HashSet;
|
||||
use std::time::SystemTime;
|
||||
|
||||
use crate::crypto::SecureRandom;
|
||||
@@ -156,3 +157,57 @@ fn emulated_server_hello_prefers_cert_payload_over_alpn_marker() {
|
||||
"ALPN marker must not displace selected certificate payload"
|
||||
);
|
||||
}
|
||||
|
||||
fn inner_content_type_bytes(
|
||||
cached: &CachedTlsData,
|
||||
client_tls_version: ClientHelloTlsVersion,
|
||||
) -> HashSet<u8> {
|
||||
let rng = SecureRandom::new();
|
||||
let mut seen = HashSet::new();
|
||||
for _ in 0..32 {
|
||||
let response = build_emulated_server_hello(
|
||||
b"secret",
|
||||
&[0x33; 32],
|
||||
&[0x43; 16],
|
||||
cached,
|
||||
true,
|
||||
true,
|
||||
client_tls_version,
|
||||
[0x13, 0x01],
|
||||
&test_server_key_share(),
|
||||
&rng,
|
||||
None,
|
||||
0,
|
||||
);
|
||||
let payload = first_app_data_payload(&response);
|
||||
assert!(payload.len() > 17);
|
||||
seen.insert(payload[payload.len() - 17]);
|
||||
}
|
||||
seen
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn emulated_server_hello_inner_content_type_position_is_not_constant() {
|
||||
let cached = make_cached(None);
|
||||
|
||||
let seen = inner_content_type_bytes(&cached, ClientHelloTlsVersion::Tls13);
|
||||
assert!(
|
||||
seen.len() > 1,
|
||||
"byte at the TLS 1.3 inner content type position must not be a fixed plaintext marker"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn emulated_server_hello_with_cert_payload_inner_content_type_position_is_not_constant() {
|
||||
let cert_msg = vec![0x0b, 0x00, 0x00, 0x05, 0x00, 0xaa, 0xbb, 0xcc, 0xdd];
|
||||
let cached = make_cached(Some(TlsCertPayload {
|
||||
cert_chain_der: vec![vec![0x30, 0x01, 0x00]],
|
||||
certificate_message: cert_msg,
|
||||
}));
|
||||
|
||||
let seen = inner_content_type_bytes(&cached, ClientHelloTlsVersion::Tls12);
|
||||
assert!(
|
||||
seen.len() > 1,
|
||||
"byte after the certificate payload must not be a fixed plaintext content type marker"
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user