rwebtransport 0.2.3 → 0.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +153 -226
- package/Cargo.toml +5 -5
- package/README.md +4 -4
- package/crates/echo-server/src/bin/gen-test-cert.rs +1 -1
- package/crates/native/Cargo.toml +1 -1
- package/crates/native/src/config.rs +13 -1
- package/crates/native/src/driver.rs +249 -91
- package/crates/native/src/lib.rs +9 -10
- package/crates/native/src/parser_memory.rs +1 -0
- package/crates/native/src/server.rs +197 -182
- package/crates/native/src/session.rs +329 -177
- package/crates/native/src/test_support.rs +2 -2
- package/crates/wtcore/src/h3.rs +166 -10
- package/dist/index.js +92 -45
- package/dist/index.js.map +2 -2
- package/dist/index.mjs +92 -45
- package/dist/index.mjs.map +2 -2
- package/dist/native.d.ts +9 -4
- package/package.json +14 -11
- package/prebuilds/darwin-arm64/rwebtransport.node +0 -0
- package/prebuilds/linux-arm64/rwebtransport.node +0 -0
- package/prebuilds/linux-x64/rwebtransport.node +0 -0
- package/prebuilds/win32-x64/rwebtransport.node +0 -0
- package/scripts/build-linux-prebuilt.sh +46 -0
- package/scripts/build.js +10 -3
- package/vendor/quiche/AGENTS.md +10 -0
- package/vendor/quiche/Cargo.lock +239 -248
- package/vendor/quiche/Cargo.toml +23 -10
- package/vendor/quiche/examples/Makefile +4 -4
- package/vendor/quiche/examples/client.rs +10 -28
- package/vendor/quiche/examples/http3-client.rs +20 -34
- package/vendor/quiche/examples/http3-server.rs +47 -78
- package/vendor/quiche/examples/server.rs +19 -49
- package/vendor/quiche/include/quiche.h +35 -4
- package/vendor/quiche/src/build.rs +17 -0
- package/vendor/quiche/src/cid.rs +129 -61
- package/vendor/quiche/src/crypto/boringssl.rs +98 -86
- package/vendor/quiche/src/crypto/mod.rs +64 -77
- package/vendor/quiche/src/dgram.rs +2 -3
- package/vendor/quiche/src/error.rs +22 -20
- package/vendor/quiche/src/ffi.rs +558 -280
- package/vendor/quiche/src/flowcontrol.rs +0 -7
- package/vendor/quiche/src/frame.rs +134 -135
- package/vendor/quiche/src/h3/ffi.rs +73 -60
- package/vendor/quiche/src/h3/frame.rs +70 -90
- package/vendor/quiche/src/h3/mod.rs +1024 -593
- package/vendor/quiche/src/h3/qpack/decoder.rs +248 -34
- package/vendor/quiche/src/h3/qpack/dynamic_table.rs +859 -0
- package/vendor/quiche/src/h3/qpack/encoder.rs +14 -17
- package/vendor/quiche/src/h3/qpack/mod.rs +48 -0
- package/vendor/quiche/src/h3/qpack/static_table.rs +86 -73
- package/vendor/quiche/src/h3/stream.rs +1009 -194
- package/vendor/quiche/src/lib.rs +1346 -1195
- package/vendor/quiche/src/minmax.rs +2 -6
- package/vendor/quiche/src/packet.rs +420 -552
- package/vendor/quiche/src/path.rs +202 -72
- package/vendor/quiche/src/pmtud.rs +18 -16
- package/vendor/quiche/src/ranges.rs +184 -82
- package/vendor/quiche/src/recovery/AGENTS.md +5 -2
- package/vendor/quiche/src/recovery/bandwidth.rs +59 -40
- package/vendor/quiche/src/recovery/bytes_in_flight.rs +2 -2
- package/vendor/quiche/src/recovery/congestion/cubic.rs +38 -47
- package/vendor/quiche/src/recovery/congestion/delivery_rate.rs +54 -60
- package/vendor/quiche/src/recovery/congestion/hystart.rs +6 -10
- package/vendor/quiche/src/recovery/congestion/mod.rs +110 -42
- package/vendor/quiche/src/recovery/congestion/prr.rs +4 -1
- package/vendor/quiche/src/recovery/congestion/recovery.rs +91 -95
- package/vendor/quiche/src/recovery/congestion/reno.rs +17 -12
- package/vendor/quiche/src/recovery/congestion/test_sender.rs +8 -27
- package/vendor/quiche/src/recovery/gcongestion/bbr/bandwidth_sampler.rs +159 -247
- package/vendor/quiche/src/recovery/gcongestion/bbr/windowed_filter.rs +9 -14
- package/vendor/quiche/src/recovery/gcongestion/bbr2/drain.rs +18 -15
- package/vendor/quiche/src/recovery/gcongestion/bbr2/mode.rs +43 -28
- package/vendor/quiche/src/recovery/gcongestion/bbr2/network_model.rs +349 -76
- package/vendor/quiche/src/recovery/gcongestion/bbr2/probe_bw.rs +147 -195
- package/vendor/quiche/src/recovery/gcongestion/bbr2/probe_rtt.rs +29 -27
- package/vendor/quiche/src/recovery/gcongestion/bbr2/rtt_jump_detector/global_min.rs +180 -0
- package/vendor/quiche/src/recovery/gcongestion/bbr2/rtt_jump_detector/global_min_tests.rs +221 -0
- package/vendor/quiche/src/recovery/gcongestion/bbr2/rtt_jump_detector/hmm.rs +395 -0
- package/vendor/quiche/src/recovery/gcongestion/bbr2/rtt_jump_detector/hmm_tests.rs +473 -0
- package/vendor/quiche/src/recovery/gcongestion/bbr2/rtt_jump_detector/mod.rs +175 -0
- package/vendor/quiche/src/recovery/gcongestion/bbr2/startup.rs +33 -26
- package/vendor/quiche/src/recovery/gcongestion/bbr2.rs +107 -60
- package/vendor/quiche/src/recovery/gcongestion/mod.rs +64 -11
- package/vendor/quiche/src/recovery/gcongestion/pacer.rs +34 -25
- package/vendor/quiche/src/recovery/gcongestion/recovery.rs +81 -86
- package/vendor/quiche/src/recovery/mod.rs +414 -173
- package/vendor/quiche/src/recovery/rtt.rs +8 -5
- package/vendor/quiche/src/stream/mod.rs +864 -133
- package/vendor/quiche/src/stream/recv_buf.rs +471 -172
- package/vendor/quiche/src/stream/send_buf.rs +338 -81
- package/vendor/quiche/src/test_utils.rs +78 -64
- package/vendor/quiche/src/tests.rs +2559 -1335
- package/vendor/quiche/src/tls/boringssl.rs +60 -63
- package/vendor/quiche/src/tls/mod.rs +146 -193
- package/vendor/quiche/src/transport_params.rs +87 -103
|
@@ -57,20 +57,18 @@ const SAMPLE_LEN: usize = 16;
|
|
|
57
57
|
|
|
58
58
|
// Set the min skip skip interval to 2x the default number of initial packet
|
|
59
59
|
// count.
|
|
60
|
-
const MIN_SKIP_COUNTER_VALUE: u64 =
|
|
61
|
-
DEFAULT_INITIAL_CONGESTION_WINDOW_PACKETS as u64 * 2;
|
|
60
|
+
const MIN_SKIP_COUNTER_VALUE: u64 = DEFAULT_INITIAL_CONGESTION_WINDOW_PACKETS as u64 * 2;
|
|
62
61
|
|
|
63
62
|
const RETRY_AEAD_ALG: crypto::Algorithm = crypto::Algorithm::AES128_GCM;
|
|
64
63
|
|
|
65
64
|
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
|
66
65
|
pub enum Epoch {
|
|
67
|
-
Initial
|
|
68
|
-
Handshake
|
|
66
|
+
Initial = 0,
|
|
67
|
+
Handshake = 1,
|
|
69
68
|
Application = 2,
|
|
70
69
|
}
|
|
71
70
|
|
|
72
|
-
static EPOCHS: [Epoch; 3] =
|
|
73
|
-
[Epoch::Initial, Epoch::Handshake, Epoch::Application];
|
|
71
|
+
static EPOCHS: [Epoch; 3] = [Epoch::Initial, Epoch::Handshake, Epoch::Application];
|
|
74
72
|
|
|
75
73
|
impl Epoch {
|
|
76
74
|
/// Returns an ordered slice containing the `Epoch`s that fit in the
|
|
@@ -174,8 +172,7 @@ impl Type {
|
|
|
174
172
|
|
|
175
173
|
Type::ZeroRTT => qlog::events::quic::PacketType::ZeroRtt,
|
|
176
174
|
|
|
177
|
-
Type::VersionNegotiation =>
|
|
178
|
-
qlog::events::quic::PacketType::VersionNegotiation,
|
|
175
|
+
Type::VersionNegotiation => qlog::events::quic::PacketType::VersionNegotiation,
|
|
179
176
|
|
|
180
177
|
Type::Short => qlog::events::quic::PacketType::OneRtt,
|
|
181
178
|
}
|
|
@@ -345,15 +342,14 @@ impl<'a> Header<'a> {
|
|
|
345
342
|
/// # Ok::<(), quiche::Error>(())
|
|
346
343
|
/// ```
|
|
347
344
|
#[inline]
|
|
348
|
-
pub fn from_slice<'b>(
|
|
349
|
-
buf: &'b mut [u8], dcid_len: usize,
|
|
350
|
-
) -> Result<Header<'a>> {
|
|
345
|
+
pub fn from_slice<'b>(buf: &'b mut [u8], dcid_len: usize) -> Result<Header<'a>> {
|
|
351
346
|
let mut b = octets::OctetsMut::with_slice(buf);
|
|
352
347
|
Header::from_bytes(&mut b, dcid_len)
|
|
353
348
|
}
|
|
354
349
|
|
|
355
350
|
pub(crate) fn from_bytes<'b>(
|
|
356
|
-
b: &'b mut octets::OctetsMut,
|
|
351
|
+
b: &'b mut octets::OctetsMut,
|
|
352
|
+
dcid_len: usize,
|
|
357
353
|
) -> Result<Header<'a>> {
|
|
358
354
|
let first = b.get_u8()?;
|
|
359
355
|
|
|
@@ -409,7 +405,7 @@ impl<'a> Header<'a> {
|
|
|
409
405
|
match ty {
|
|
410
406
|
Type::Initial => {
|
|
411
407
|
token = Some(b.get_bytes_with_varint_length()?.to_vec());
|
|
412
|
-
}
|
|
408
|
+
}
|
|
413
409
|
|
|
414
410
|
Type::Retry => {
|
|
415
411
|
const TAG_LEN: usize = RETRY_AEAD_ALG.tag_len();
|
|
@@ -421,7 +417,7 @@ impl<'a> Header<'a> {
|
|
|
421
417
|
|
|
422
418
|
let token_len = b.cap() - TAG_LEN;
|
|
423
419
|
token = Some(b.get_bytes(token_len)?.to_vec());
|
|
424
|
-
}
|
|
420
|
+
}
|
|
425
421
|
|
|
426
422
|
Type::VersionNegotiation => {
|
|
427
423
|
let mut list: Vec<u32> = Vec::new();
|
|
@@ -432,7 +428,7 @@ impl<'a> Header<'a> {
|
|
|
432
428
|
}
|
|
433
429
|
|
|
434
430
|
versions = Some(list);
|
|
435
|
-
}
|
|
431
|
+
}
|
|
436
432
|
|
|
437
433
|
_ => (),
|
|
438
434
|
};
|
|
@@ -505,19 +501,19 @@ impl<'a> Header<'a> {
|
|
|
505
501
|
Some(ref v) => {
|
|
506
502
|
out.put_varint(v.len() as u64)?;
|
|
507
503
|
out.put_bytes(v)?;
|
|
508
|
-
}
|
|
504
|
+
}
|
|
509
505
|
|
|
510
506
|
// No token, so length = 0.
|
|
511
507
|
None => {
|
|
512
508
|
out.put_varint(0)?;
|
|
513
|
-
}
|
|
509
|
+
}
|
|
514
510
|
}
|
|
515
|
-
}
|
|
511
|
+
}
|
|
516
512
|
|
|
517
513
|
Type::Retry => {
|
|
518
514
|
// Retry packets don't have a token length.
|
|
519
515
|
out.put_bytes(self.token.as_ref().unwrap())?;
|
|
520
|
-
}
|
|
516
|
+
}
|
|
521
517
|
|
|
522
518
|
_ => (),
|
|
523
519
|
}
|
|
@@ -574,9 +570,7 @@ pub fn pkt_num_len(pn: u64, largest_acked: u64) -> usize {
|
|
|
574
570
|
min_bits.div_ceil(8) as usize
|
|
575
571
|
}
|
|
576
572
|
|
|
577
|
-
pub fn decrypt_hdr(
|
|
578
|
-
b: &mut octets::OctetsMut, hdr: &mut Header, aead: &crypto::Open,
|
|
579
|
-
) -> Result<()> {
|
|
573
|
+
pub fn decrypt_hdr(b: &mut octets::OctetsMut, hdr: &mut Header, aead: &crypto::Open) -> Result<()> {
|
|
580
574
|
let mut first = {
|
|
581
575
|
let (first_buf, _) = b.split_at(1)?;
|
|
582
576
|
first_buf.as_ref()[0]
|
|
@@ -639,8 +633,7 @@ pub fn decode_pkt_num(largest_pn: u64, truncated_pn: u64, pn_len: usize) -> u64
|
|
|
639
633
|
let pn_mask = pn_win - 1;
|
|
640
634
|
let candidate_pn = (expected_pn & !pn_mask) | truncated_pn;
|
|
641
635
|
|
|
642
|
-
if candidate_pn + pn_hwin <= expected_pn && candidate_pn < (1 << 62) - pn_win
|
|
643
|
-
{
|
|
636
|
+
if candidate_pn + pn_hwin <= expected_pn && candidate_pn < (1 << 62) - pn_win {
|
|
644
637
|
return candidate_pn + pn_win;
|
|
645
638
|
}
|
|
646
639
|
|
|
@@ -652,7 +645,10 @@ pub fn decode_pkt_num(largest_pn: u64, truncated_pn: u64, pn_len: usize) -> u64
|
|
|
652
645
|
}
|
|
653
646
|
|
|
654
647
|
pub fn decrypt_pkt<'a>(
|
|
655
|
-
b: &'a mut octets::OctetsMut,
|
|
648
|
+
b: &'a mut octets::OctetsMut,
|
|
649
|
+
pn: u64,
|
|
650
|
+
pn_len: usize,
|
|
651
|
+
payload_len: usize,
|
|
656
652
|
aead: &crypto::Open,
|
|
657
653
|
) -> Result<octets::Octets<'a>> {
|
|
658
654
|
let payload_offset = b.off();
|
|
@@ -665,17 +661,18 @@ pub fn decrypt_pkt<'a>(
|
|
|
665
661
|
|
|
666
662
|
let mut ciphertext = payload.peek_bytes_mut(payload_len)?;
|
|
667
663
|
|
|
668
|
-
let payload_len =
|
|
669
|
-
aead.open_with_u64_counter(pn, header.as_ref(), ciphertext.as_mut())?;
|
|
664
|
+
let payload_len = aead.open_with_u64_counter(pn, header.as_ref(), ciphertext.as_mut())?;
|
|
670
665
|
|
|
671
666
|
Ok(b.get_bytes(payload_len)?)
|
|
672
667
|
}
|
|
673
668
|
|
|
674
669
|
pub fn encrypt_hdr(
|
|
675
|
-
b: &mut octets::OctetsMut,
|
|
670
|
+
b: &mut octets::OctetsMut,
|
|
671
|
+
pn_len: usize,
|
|
672
|
+
payload: &[u8],
|
|
673
|
+
aead: &crypto::Seal,
|
|
676
674
|
) -> Result<()> {
|
|
677
|
-
let sample = &payload
|
|
678
|
-
[MAX_PKT_NUM_LEN - pn_len..SAMPLE_LEN + (MAX_PKT_NUM_LEN - pn_len)];
|
|
675
|
+
let sample = &payload[MAX_PKT_NUM_LEN - pn_len..SAMPLE_LEN + (MAX_PKT_NUM_LEN - pn_len)];
|
|
679
676
|
|
|
680
677
|
let mask = aead.new_mask(sample)?;
|
|
681
678
|
|
|
@@ -698,27 +695,25 @@ pub fn encrypt_hdr(
|
|
|
698
695
|
}
|
|
699
696
|
|
|
700
697
|
pub fn encrypt_pkt(
|
|
701
|
-
b: &mut octets::OctetsMut,
|
|
702
|
-
|
|
698
|
+
b: &mut octets::OctetsMut,
|
|
699
|
+
pn: u64,
|
|
700
|
+
pn_len: usize,
|
|
701
|
+
payload_len: usize,
|
|
702
|
+
payload_offset: usize,
|
|
703
|
+
extra_in: Option<&[u8]>,
|
|
704
|
+
aead: &mut crypto::Seal,
|
|
703
705
|
) -> Result<usize> {
|
|
704
706
|
let (mut header, mut payload) = b.split_at(payload_offset)?;
|
|
705
707
|
|
|
706
|
-
let ciphertext_len =
|
|
707
|
-
pn,
|
|
708
|
-
header.as_ref(),
|
|
709
|
-
payload.as_mut(),
|
|
710
|
-
payload_len,
|
|
711
|
-
extra_in,
|
|
712
|
-
)?;
|
|
708
|
+
let ciphertext_len =
|
|
709
|
+
aead.seal_with_u64_counter(pn, header.as_ref(), payload.as_mut(), payload_len, extra_in)?;
|
|
713
710
|
|
|
714
711
|
encrypt_hdr(&mut header, pn_len, payload.as_ref(), aead)?;
|
|
715
712
|
|
|
716
713
|
Ok(payload_offset + ciphertext_len)
|
|
717
714
|
}
|
|
718
715
|
|
|
719
|
-
pub fn encode_pkt_num(
|
|
720
|
-
pn: u64, pn_len: usize, b: &mut octets::OctetsMut,
|
|
721
|
-
) -> Result<()> {
|
|
716
|
+
pub fn encode_pkt_num(pn: u64, pn_len: usize, b: &mut octets::OctetsMut) -> Result<()> {
|
|
722
717
|
match pn_len {
|
|
723
718
|
1 => b.put_u8(pn as u8)?,
|
|
724
719
|
|
|
@@ -734,9 +729,7 @@ pub fn encode_pkt_num(
|
|
|
734
729
|
Ok(())
|
|
735
730
|
}
|
|
736
731
|
|
|
737
|
-
pub fn negotiate_version(
|
|
738
|
-
scid: &[u8], dcid: &[u8], out: &mut [u8],
|
|
739
|
-
) -> Result<usize> {
|
|
732
|
+
pub fn negotiate_version(scid: &[u8], dcid: &[u8], out: &mut [u8]) -> Result<usize> {
|
|
740
733
|
let mut b = octets::OctetsMut::with_slice(out);
|
|
741
734
|
|
|
742
735
|
let first = rand::rand_u8() | FORM_BIT;
|
|
@@ -754,7 +747,11 @@ pub fn negotiate_version(
|
|
|
754
747
|
}
|
|
755
748
|
|
|
756
749
|
pub fn retry(
|
|
757
|
-
scid: &[u8],
|
|
750
|
+
scid: &[u8],
|
|
751
|
+
dcid: &[u8],
|
|
752
|
+
new_scid: &[u8],
|
|
753
|
+
token: &[u8],
|
|
754
|
+
version: u32,
|
|
758
755
|
out: &mut [u8],
|
|
759
756
|
) -> Result<usize> {
|
|
760
757
|
let mut b = octets::OctetsMut::with_slice(out);
|
|
@@ -784,9 +781,7 @@ pub fn retry(
|
|
|
784
781
|
Ok(b.off())
|
|
785
782
|
}
|
|
786
783
|
|
|
787
|
-
pub fn verify_retry_integrity(
|
|
788
|
-
b: &octets::OctetsMut, odcid: &[u8], version: u32,
|
|
789
|
-
) -> Result<()> {
|
|
784
|
+
pub fn verify_retry_integrity(b: &octets::OctetsMut, odcid: &[u8], version: u32) -> Result<()> {
|
|
790
785
|
const TAG_LEN: usize = RETRY_AEAD_ALG.tag_len();
|
|
791
786
|
|
|
792
787
|
let tag = compute_retry_integrity_tag(b, odcid, version)?;
|
|
@@ -795,14 +790,16 @@ pub fn verify_retry_integrity(
|
|
|
795
790
|
}
|
|
796
791
|
|
|
797
792
|
fn compute_retry_integrity_tag(
|
|
798
|
-
b: &octets::OctetsMut,
|
|
793
|
+
b: &octets::OctetsMut,
|
|
794
|
+
odcid: &[u8],
|
|
795
|
+
version: u32,
|
|
799
796
|
) -> Result<Vec<u8>> {
|
|
800
797
|
const KEY_LEN: usize = RETRY_AEAD_ALG.key_len();
|
|
801
798
|
const TAG_LEN: usize = RETRY_AEAD_ALG.tag_len();
|
|
802
799
|
|
|
803
800
|
const RETRY_INTEGRITY_KEY_V1: [u8; KEY_LEN] = [
|
|
804
|
-
0xbe, 0x0c, 0x69, 0x0b, 0x9f, 0x66, 0x57, 0x5a, 0x1d, 0x76, 0x6b, 0x54,
|
|
805
|
-
|
|
801
|
+
0xbe, 0x0c, 0x69, 0x0b, 0x9f, 0x66, 0x57, 0x5a, 0x1d, 0x76, 0x6b, 0x54, 0xe3, 0x68, 0xc8,
|
|
802
|
+
0x4e,
|
|
806
803
|
];
|
|
807
804
|
|
|
808
805
|
const RETRY_INTEGRITY_NONCE_V1: [u8; crypto::MAX_NONCE_LEN] = [
|
|
@@ -810,8 +807,7 @@ fn compute_retry_integrity_tag(
|
|
|
810
807
|
];
|
|
811
808
|
|
|
812
809
|
let (key, nonce) = match version {
|
|
813
|
-
crate::PROTOCOL_VERSION_V1 =>
|
|
814
|
-
(&RETRY_INTEGRITY_KEY_V1, RETRY_INTEGRITY_NONCE_V1),
|
|
810
|
+
crate::PROTOCOL_VERSION_V1 => (&RETRY_INTEGRITY_KEY_V1, RETRY_INTEGRITY_NONCE_V1),
|
|
815
811
|
|
|
816
812
|
_ => (&RETRY_INTEGRITY_KEY_V1, RETRY_INTEGRITY_NONCE_V1),
|
|
817
813
|
};
|
|
@@ -907,8 +903,7 @@ impl PktNumSpace {
|
|
|
907
903
|
|
|
908
904
|
pub fn on_packet_sent(&mut self, sent_pkt: &recovery::Sent) {
|
|
909
905
|
// Track the largest packet number sent
|
|
910
|
-
self.largest_tx_pkt_num =
|
|
911
|
-
self.largest_tx_pkt_num.max(Some(sent_pkt.pkt_num));
|
|
906
|
+
self.largest_tx_pkt_num = self.largest_tx_pkt_num.max(Some(sent_pkt.pkt_num));
|
|
912
907
|
}
|
|
913
908
|
}
|
|
914
909
|
|
|
@@ -1034,7 +1029,9 @@ impl PktNumManager {
|
|
|
1034
1029
|
}
|
|
1035
1030
|
|
|
1036
1031
|
pub fn on_packet_sent(
|
|
1037
|
-
&mut self,
|
|
1032
|
+
&mut self,
|
|
1033
|
+
cwnd: usize,
|
|
1034
|
+
max_datagram_size: usize,
|
|
1038
1035
|
handshake_completed: bool,
|
|
1039
1036
|
) {
|
|
1040
1037
|
// Decrement skip_pn_counter for each packet sent
|
|
@@ -1058,9 +1055,9 @@ impl PktNumManager {
|
|
|
1058
1055
|
}
|
|
1059
1056
|
|
|
1060
1057
|
pub fn should_skip_pn(&self, handshake_completed: bool) -> bool {
|
|
1061
|
-
// Only skip
|
|
1062
|
-
//
|
|
1063
|
-
//
|
|
1058
|
+
// Only skip after confirming the peer did not send the current skip
|
|
1059
|
+
// packet. For OACK, an ACK for a higher packet number validates
|
|
1060
|
+
// `skip_pn`.
|
|
1064
1061
|
let no_current_skip_packet = self.skip_pn.is_none();
|
|
1065
1062
|
let counter_expired = match self.skip_pn_counter {
|
|
1066
1063
|
// Skip if counter has expired
|
|
@@ -1177,8 +1174,7 @@ mod tests {
|
|
|
1177
1174
|
let hdr = Header {
|
|
1178
1175
|
ty: Type::Retry,
|
|
1179
1176
|
version: 0xafafafaf,
|
|
1180
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1181
|
-
.into(),
|
|
1177
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1182
1178
|
scid: vec![0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb].into(),
|
|
1183
1179
|
pkt_num: 0,
|
|
1184
1180
|
pkt_num_len: 0,
|
|
@@ -1204,8 +1200,7 @@ mod tests {
|
|
|
1204
1200
|
let hdr = Header {
|
|
1205
1201
|
ty: Type::Initial,
|
|
1206
1202
|
version: 0xafafafaf,
|
|
1207
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1208
|
-
.into(),
|
|
1203
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1209
1204
|
scid: vec![0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb].into(),
|
|
1210
1205
|
pkt_num: 0,
|
|
1211
1206
|
pkt_num_len: 0,
|
|
@@ -1229,8 +1224,8 @@ mod tests {
|
|
|
1229
1224
|
ty: Type::Initial,
|
|
1230
1225
|
version: crate::PROTOCOL_VERSION,
|
|
1231
1226
|
dcid: vec![
|
|
1232
|
-
0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba,
|
|
1233
|
-
0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba,
|
|
1227
|
+
0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba,
|
|
1228
|
+
0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba,
|
|
1234
1229
|
]
|
|
1235
1230
|
.into(),
|
|
1236
1231
|
scid: vec![0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb].into(),
|
|
@@ -1255,11 +1250,10 @@ mod tests {
|
|
|
1255
1250
|
let hdr = Header {
|
|
1256
1251
|
ty: Type::Initial,
|
|
1257
1252
|
version: crate::PROTOCOL_VERSION,
|
|
1258
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1259
|
-
.into(),
|
|
1253
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1260
1254
|
scid: vec![
|
|
1261
|
-
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1262
|
-
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1255
|
+
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1256
|
+
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1263
1257
|
]
|
|
1264
1258
|
.into(),
|
|
1265
1259
|
pkt_num: 0,
|
|
@@ -1283,11 +1277,10 @@ mod tests {
|
|
|
1283
1277
|
let hdr = Header {
|
|
1284
1278
|
ty: Type::Initial,
|
|
1285
1279
|
version: 0xafafafaf,
|
|
1286
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1287
|
-
.into(),
|
|
1280
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1288
1281
|
scid: vec![
|
|
1289
|
-
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1290
|
-
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1282
|
+
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1283
|
+
0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb,
|
|
1291
1284
|
]
|
|
1292
1285
|
.into(),
|
|
1293
1286
|
pkt_num: 0,
|
|
@@ -1311,8 +1304,7 @@ mod tests {
|
|
|
1311
1304
|
let hdr = Header {
|
|
1312
1305
|
ty: Type::Handshake,
|
|
1313
1306
|
version: 0xafafafaf,
|
|
1314
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1315
|
-
.into(),
|
|
1307
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1316
1308
|
scid: vec![0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb].into(),
|
|
1317
1309
|
pkt_num: 0,
|
|
1318
1310
|
pkt_num_len: 0,
|
|
@@ -1335,8 +1327,7 @@ mod tests {
|
|
|
1335
1327
|
let hdr = Header {
|
|
1336
1328
|
ty: Type::Short,
|
|
1337
1329
|
version: 0,
|
|
1338
|
-
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba]
|
|
1339
|
-
.into(),
|
|
1330
|
+
dcid: vec![0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba].into(),
|
|
1340
1331
|
scid: ConnectionId::default(),
|
|
1341
1332
|
pkt_num: 0,
|
|
1342
1333
|
pkt_num_len: 0,
|
|
@@ -1503,8 +1494,12 @@ mod tests {
|
|
|
1503
1494
|
}
|
|
1504
1495
|
|
|
1505
1496
|
fn assert_decrypt_initial_pkt(
|
|
1506
|
-
pkt: &mut [u8],
|
|
1507
|
-
|
|
1497
|
+
pkt: &mut [u8],
|
|
1498
|
+
dcid: &[u8],
|
|
1499
|
+
is_server: bool,
|
|
1500
|
+
expected_frames: &[u8],
|
|
1501
|
+
expected_pn: u64,
|
|
1502
|
+
expected_pn_len: usize,
|
|
1508
1503
|
) {
|
|
1509
1504
|
let mut b = octets::OctetsMut::with_slice(pkt);
|
|
1510
1505
|
|
|
@@ -1513,13 +1508,8 @@ mod tests {
|
|
|
1513
1508
|
|
|
1514
1509
|
let payload_len = b.get_varint().unwrap() as usize;
|
|
1515
1510
|
|
|
1516
|
-
let (aead, _) =
|
|
1517
|
-
dcid,
|
|
1518
|
-
hdr.version,
|
|
1519
|
-
is_server,
|
|
1520
|
-
false,
|
|
1521
|
-
)
|
|
1522
|
-
.unwrap();
|
|
1511
|
+
let (aead, _) =
|
|
1512
|
+
crypto::derive_initial_key_material(dcid, hdr.version, is_server, false).unwrap();
|
|
1523
1513
|
|
|
1524
1514
|
decrypt_hdr(&mut b, &mut hdr, &aead).unwrap();
|
|
1525
1515
|
assert_eq!(hdr.pkt_num_len, expected_pn_len);
|
|
@@ -1527,8 +1517,7 @@ mod tests {
|
|
|
1527
1517
|
let pn = decode_pkt_num(0, hdr.pkt_num, hdr.pkt_num_len);
|
|
1528
1518
|
assert_eq!(pn, expected_pn);
|
|
1529
1519
|
|
|
1530
|
-
let payload =
|
|
1531
|
-
decrypt_pkt(&mut b, pn, hdr.pkt_num_len, payload_len, &aead).unwrap();
|
|
1520
|
+
let payload = decrypt_pkt(&mut b, pn, hdr.pkt_num_len, payload_len, &aead).unwrap();
|
|
1532
1521
|
|
|
1533
1522
|
let payload = payload.as_ref();
|
|
1534
1523
|
assert_eq!(&payload[..expected_frames.len()], expected_frames);
|
|
@@ -1537,144 +1526,115 @@ mod tests {
|
|
|
1537
1526
|
#[test]
|
|
1538
1527
|
fn decrypt_client_initial_v1() {
|
|
1539
1528
|
let mut pkt = [
|
|
1540
|
-
0xc0, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e,
|
|
1541
|
-
|
|
1542
|
-
|
|
1543
|
-
|
|
1544
|
-
|
|
1545
|
-
|
|
1546
|
-
|
|
1547
|
-
|
|
1548
|
-
|
|
1549
|
-
|
|
1550
|
-
|
|
1551
|
-
|
|
1552
|
-
|
|
1553
|
-
|
|
1554
|
-
|
|
1555
|
-
|
|
1556
|
-
|
|
1557
|
-
|
|
1558
|
-
|
|
1559
|
-
|
|
1560
|
-
|
|
1561
|
-
0xf6,
|
|
1562
|
-
|
|
1563
|
-
|
|
1564
|
-
|
|
1565
|
-
|
|
1566
|
-
|
|
1567
|
-
|
|
1568
|
-
|
|
1569
|
-
|
|
1570
|
-
|
|
1571
|
-
|
|
1572
|
-
|
|
1573
|
-
|
|
1574
|
-
|
|
1575
|
-
|
|
1576
|
-
0x8b,
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
|
|
1583
|
-
|
|
1584
|
-
|
|
1585
|
-
|
|
1586
|
-
|
|
1587
|
-
|
|
1588
|
-
|
|
1589
|
-
|
|
1590
|
-
|
|
1591
|
-
|
|
1592
|
-
|
|
1593
|
-
|
|
1594
|
-
|
|
1595
|
-
|
|
1596
|
-
|
|
1597
|
-
|
|
1598
|
-
|
|
1599
|
-
|
|
1600
|
-
|
|
1601
|
-
|
|
1602
|
-
|
|
1603
|
-
|
|
1604
|
-
|
|
1605
|
-
|
|
1606
|
-
|
|
1607
|
-
|
|
1608
|
-
|
|
1609
|
-
|
|
1610
|
-
|
|
1611
|
-
|
|
1612
|
-
|
|
1613
|
-
|
|
1614
|
-
|
|
1615
|
-
|
|
1616
|
-
|
|
1617
|
-
|
|
1618
|
-
|
|
1619
|
-
|
|
1620
|
-
|
|
1621
|
-
|
|
1622
|
-
0xd4,
|
|
1623
|
-
|
|
1624
|
-
|
|
1625
|
-
|
|
1626
|
-
0xcb, 0x90, 0x92, 0x71, 0xa6, 0xec, 0xbc, 0xb5, 0x8b, 0x93, 0x6a,
|
|
1627
|
-
0x88, 0xcd, 0x4e, 0x8f, 0x2e, 0x6f, 0xf5, 0x80, 0x01, 0x75, 0xf1,
|
|
1628
|
-
0x13, 0x25, 0x3d, 0x8f, 0xa9, 0xca, 0x88, 0x85, 0xc2, 0xf5, 0x52,
|
|
1629
|
-
0xe6, 0x57, 0xdc, 0x60, 0x3f, 0x25, 0x2e, 0x1a, 0x8e, 0x30, 0x8f,
|
|
1630
|
-
0x76, 0xf0, 0xbe, 0x79, 0xe2, 0xfb, 0x8f, 0x5d, 0x5f, 0xbb, 0xe2,
|
|
1631
|
-
0xe3, 0x0e, 0xca, 0xdd, 0x22, 0x07, 0x23, 0xc8, 0xc0, 0xae, 0xa8,
|
|
1632
|
-
0x07, 0x8c, 0xdf, 0xcb, 0x38, 0x68, 0x26, 0x3f, 0xf8, 0xf0, 0x94,
|
|
1633
|
-
0x00, 0x54, 0xda, 0x48, 0x78, 0x18, 0x93, 0xa7, 0xe4, 0x9a, 0xd5,
|
|
1634
|
-
0xaf, 0xf4, 0xaf, 0x30, 0x0c, 0xd8, 0x04, 0xa6, 0xb6, 0x27, 0x9a,
|
|
1635
|
-
0xb3, 0xff, 0x3a, 0xfb, 0x64, 0x49, 0x1c, 0x85, 0x19, 0x4a, 0xab,
|
|
1636
|
-
0x76, 0x0d, 0x58, 0xa6, 0x06, 0x65, 0x4f, 0x9f, 0x44, 0x00, 0xe8,
|
|
1637
|
-
0xb3, 0x85, 0x91, 0x35, 0x6f, 0xbf, 0x64, 0x25, 0xac, 0xa2, 0x6d,
|
|
1638
|
-
0xc8, 0x52, 0x44, 0x25, 0x9f, 0xf2, 0xb1, 0x9c, 0x41, 0xb9, 0xf9,
|
|
1639
|
-
0x6f, 0x3c, 0xa9, 0xec, 0x1d, 0xde, 0x43, 0x4d, 0xa7, 0xd2, 0xd3,
|
|
1640
|
-
0x92, 0xb9, 0x05, 0xdd, 0xf3, 0xd1, 0xf9, 0xaf, 0x93, 0xd1, 0xaf,
|
|
1641
|
-
0x59, 0x50, 0xbd, 0x49, 0x3f, 0x5a, 0xa7, 0x31, 0xb4, 0x05, 0x6d,
|
|
1642
|
-
0xf3, 0x1b, 0xd2, 0x67, 0xb6, 0xb9, 0x0a, 0x07, 0x98, 0x31, 0xaa,
|
|
1643
|
-
0xf5, 0x79, 0xbe, 0x0a, 0x39, 0x01, 0x31, 0x37, 0xaa, 0xc6, 0xd4,
|
|
1644
|
-
0x04, 0xf5, 0x18, 0xcf, 0xd4, 0x68, 0x40, 0x64, 0x7e, 0x78, 0xbf,
|
|
1645
|
-
0xe7, 0x06, 0xca, 0x4c, 0xf5, 0xe9, 0xc5, 0x45, 0x3e, 0x9f, 0x7c,
|
|
1646
|
-
0xfd, 0x2b, 0x8b, 0x4c, 0x8d, 0x16, 0x9a, 0x44, 0xe5, 0x5c, 0x88,
|
|
1647
|
-
0xd4, 0xa9, 0xa7, 0xf9, 0x47, 0x42, 0x41, 0x10, 0x92, 0xab, 0xbd,
|
|
1648
|
-
0xf8, 0xb8, 0x89, 0xe5, 0xc1, 0x99, 0xd0, 0x96, 0xe3, 0xf2, 0x47,
|
|
1649
|
-
0x88,
|
|
1529
|
+
0xc0, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08,
|
|
1530
|
+
0x00, 0x00, 0x44, 0x9e, 0x7b, 0x9a, 0xec, 0x34, 0xd1, 0xb1, 0xc9, 0x8d, 0xd7, 0x68,
|
|
1531
|
+
0x9f, 0xb8, 0xec, 0x11, 0xd2, 0x42, 0xb1, 0x23, 0xdc, 0x9b, 0xd8, 0xba, 0xb9, 0x36,
|
|
1532
|
+
0xb4, 0x7d, 0x92, 0xec, 0x35, 0x6c, 0x0b, 0xab, 0x7d, 0xf5, 0x97, 0x6d, 0x27, 0xcd,
|
|
1533
|
+
0x44, 0x9f, 0x63, 0x30, 0x00, 0x99, 0xf3, 0x99, 0x1c, 0x26, 0x0e, 0xc4, 0xc6, 0x0d,
|
|
1534
|
+
0x17, 0xb3, 0x1f, 0x84, 0x29, 0x15, 0x7b, 0xb3, 0x5a, 0x12, 0x82, 0xa6, 0x43, 0xa8,
|
|
1535
|
+
0xd2, 0x26, 0x2c, 0xad, 0x67, 0x50, 0x0c, 0xad, 0xb8, 0xe7, 0x37, 0x8c, 0x8e, 0xb7,
|
|
1536
|
+
0x53, 0x9e, 0xc4, 0xd4, 0x90, 0x5f, 0xed, 0x1b, 0xee, 0x1f, 0xc8, 0xaa, 0xfb, 0xa1,
|
|
1537
|
+
0x7c, 0x75, 0x0e, 0x2c, 0x7a, 0xce, 0x01, 0xe6, 0x00, 0x5f, 0x80, 0xfc, 0xb7, 0xdf,
|
|
1538
|
+
0x62, 0x12, 0x30, 0xc8, 0x37, 0x11, 0xb3, 0x93, 0x43, 0xfa, 0x02, 0x8c, 0xea, 0x7f,
|
|
1539
|
+
0x7f, 0xb5, 0xff, 0x89, 0xea, 0xc2, 0x30, 0x82, 0x49, 0xa0, 0x22, 0x52, 0x15, 0x5e,
|
|
1540
|
+
0x23, 0x47, 0xb6, 0x3d, 0x58, 0xc5, 0x45, 0x7a, 0xfd, 0x84, 0xd0, 0x5d, 0xff, 0xfd,
|
|
1541
|
+
0xb2, 0x03, 0x92, 0x84, 0x4a, 0xe8, 0x12, 0x15, 0x46, 0x82, 0xe9, 0xcf, 0x01, 0x2f,
|
|
1542
|
+
0x90, 0x21, 0xa6, 0xf0, 0xbe, 0x17, 0xdd, 0xd0, 0xc2, 0x08, 0x4d, 0xce, 0x25, 0xff,
|
|
1543
|
+
0x9b, 0x06, 0xcd, 0xe5, 0x35, 0xd0, 0xf9, 0x20, 0xa2, 0xdb, 0x1b, 0xf3, 0x62, 0xc2,
|
|
1544
|
+
0x3e, 0x59, 0x6d, 0xee, 0x38, 0xf5, 0xa6, 0xcf, 0x39, 0x48, 0x83, 0x8a, 0x3a, 0xec,
|
|
1545
|
+
0x4e, 0x15, 0xda, 0xf8, 0x50, 0x0a, 0x6e, 0xf6, 0x9e, 0xc4, 0xe3, 0xfe, 0xb6, 0xb1,
|
|
1546
|
+
0xd9, 0x8e, 0x61, 0x0a, 0xc8, 0xb7, 0xec, 0x3f, 0xaf, 0x6a, 0xd7, 0x60, 0xb7, 0xba,
|
|
1547
|
+
0xd1, 0xdb, 0x4b, 0xa3, 0x48, 0x5e, 0x8a, 0x94, 0xdc, 0x25, 0x0a, 0xe3, 0xfd, 0xb4,
|
|
1548
|
+
0x1e, 0xd1, 0x5f, 0xb6, 0xa8, 0xe5, 0xeb, 0xa0, 0xfc, 0x3d, 0xd6, 0x0b, 0xc8, 0xe3,
|
|
1549
|
+
0x0c, 0x5c, 0x42, 0x87, 0xe5, 0x38, 0x05, 0xdb, 0x05, 0x9a, 0xe0, 0x64, 0x8d, 0xb2,
|
|
1550
|
+
0xf6, 0x42, 0x64, 0xed, 0x5e, 0x39, 0xbe, 0x2e, 0x20, 0xd8, 0x2d, 0xf5, 0x66, 0xda,
|
|
1551
|
+
0x8d, 0xd5, 0x99, 0x8c, 0xca, 0xbd, 0xae, 0x05, 0x30, 0x60, 0xae, 0x6c, 0x7b, 0x43,
|
|
1552
|
+
0x78, 0xe8, 0x46, 0xd2, 0x9f, 0x37, 0xed, 0x7b, 0x4e, 0xa9, 0xec, 0x5d, 0x82, 0xe7,
|
|
1553
|
+
0x96, 0x1b, 0x7f, 0x25, 0xa9, 0x32, 0x38, 0x51, 0xf6, 0x81, 0xd5, 0x82, 0x36, 0x3a,
|
|
1554
|
+
0xa5, 0xf8, 0x99, 0x37, 0xf5, 0xa6, 0x72, 0x58, 0xbf, 0x63, 0xad, 0x6f, 0x1a, 0x0b,
|
|
1555
|
+
0x1d, 0x96, 0xdb, 0xd4, 0xfa, 0xdd, 0xfc, 0xef, 0xc5, 0x26, 0x6b, 0xa6, 0x61, 0x17,
|
|
1556
|
+
0x22, 0x39, 0x5c, 0x90, 0x65, 0x56, 0xbe, 0x52, 0xaf, 0xe3, 0xf5, 0x65, 0x63, 0x6a,
|
|
1557
|
+
0xd1, 0xb1, 0x7d, 0x50, 0x8b, 0x73, 0xd8, 0x74, 0x3e, 0xeb, 0x52, 0x4b, 0xe2, 0x2b,
|
|
1558
|
+
0x3d, 0xcb, 0xc2, 0xc7, 0x46, 0x8d, 0x54, 0x11, 0x9c, 0x74, 0x68, 0x44, 0x9a, 0x13,
|
|
1559
|
+
0xd8, 0xe3, 0xb9, 0x58, 0x11, 0xa1, 0x98, 0xf3, 0x49, 0x1d, 0xe3, 0xe7, 0xfe, 0x94,
|
|
1560
|
+
0x2b, 0x33, 0x04, 0x07, 0xab, 0xf8, 0x2a, 0x4e, 0xd7, 0xc1, 0xb3, 0x11, 0x66, 0x3a,
|
|
1561
|
+
0xc6, 0x98, 0x90, 0xf4, 0x15, 0x70, 0x15, 0x85, 0x3d, 0x91, 0xe9, 0x23, 0x03, 0x7c,
|
|
1562
|
+
0x22, 0x7a, 0x33, 0xcd, 0xd5, 0xec, 0x28, 0x1c, 0xa3, 0xf7, 0x9c, 0x44, 0x54, 0x6b,
|
|
1563
|
+
0x9d, 0x90, 0xca, 0x00, 0xf0, 0x64, 0xc9, 0x9e, 0x3d, 0xd9, 0x79, 0x11, 0xd3, 0x9f,
|
|
1564
|
+
0xe9, 0xc5, 0xd0, 0xb2, 0x3a, 0x22, 0x9a, 0x23, 0x4c, 0xb3, 0x61, 0x86, 0xc4, 0x81,
|
|
1565
|
+
0x9e, 0x8b, 0x9c, 0x59, 0x27, 0x72, 0x66, 0x32, 0x29, 0x1d, 0x6a, 0x41, 0x82, 0x11,
|
|
1566
|
+
0xcc, 0x29, 0x62, 0xe2, 0x0f, 0xe4, 0x7f, 0xeb, 0x3e, 0xdf, 0x33, 0x0f, 0x2c, 0x60,
|
|
1567
|
+
0x3a, 0x9d, 0x48, 0xc0, 0xfc, 0xb5, 0x69, 0x9d, 0xbf, 0xe5, 0x89, 0x64, 0x25, 0xc5,
|
|
1568
|
+
0xba, 0xc4, 0xae, 0xe8, 0x2e, 0x57, 0xa8, 0x5a, 0xaf, 0x4e, 0x25, 0x13, 0xe4, 0xf0,
|
|
1569
|
+
0x57, 0x96, 0xb0, 0x7b, 0xa2, 0xee, 0x47, 0xd8, 0x05, 0x06, 0xf8, 0xd2, 0xc2, 0x5e,
|
|
1570
|
+
0x50, 0xfd, 0x14, 0xde, 0x71, 0xe6, 0xc4, 0x18, 0x55, 0x93, 0x02, 0xf9, 0x39, 0xb0,
|
|
1571
|
+
0xe1, 0xab, 0xd5, 0x76, 0xf2, 0x79, 0xc4, 0xb2, 0xe0, 0xfe, 0xb8, 0x5c, 0x1f, 0x28,
|
|
1572
|
+
0xff, 0x18, 0xf5, 0x88, 0x91, 0xff, 0xef, 0x13, 0x2e, 0xef, 0x2f, 0xa0, 0x93, 0x46,
|
|
1573
|
+
0xae, 0xe3, 0x3c, 0x28, 0xeb, 0x13, 0x0f, 0xf2, 0x8f, 0x5b, 0x76, 0x69, 0x53, 0x33,
|
|
1574
|
+
0x41, 0x13, 0x21, 0x19, 0x96, 0xd2, 0x00, 0x11, 0xa1, 0x98, 0xe3, 0xfc, 0x43, 0x3f,
|
|
1575
|
+
0x9f, 0x25, 0x41, 0x01, 0x0a, 0xe1, 0x7c, 0x1b, 0xf2, 0x02, 0x58, 0x0f, 0x60, 0x47,
|
|
1576
|
+
0x47, 0x2f, 0xb3, 0x68, 0x57, 0xfe, 0x84, 0x3b, 0x19, 0xf5, 0x98, 0x40, 0x09, 0xdd,
|
|
1577
|
+
0xc3, 0x24, 0x04, 0x4e, 0x84, 0x7a, 0x4f, 0x4a, 0x0a, 0xb3, 0x4f, 0x71, 0x95, 0x95,
|
|
1578
|
+
0xde, 0x37, 0x25, 0x2d, 0x62, 0x35, 0x36, 0x5e, 0x9b, 0x84, 0x39, 0x2b, 0x06, 0x10,
|
|
1579
|
+
0x85, 0x34, 0x9d, 0x73, 0x20, 0x3a, 0x4a, 0x13, 0xe9, 0x6f, 0x54, 0x32, 0xec, 0x0f,
|
|
1580
|
+
0xd4, 0xa1, 0xee, 0x65, 0xac, 0xcd, 0xd5, 0xe3, 0x90, 0x4d, 0xf5, 0x4c, 0x1d, 0xa5,
|
|
1581
|
+
0x10, 0xb0, 0xff, 0x20, 0xdc, 0xc0, 0xc7, 0x7f, 0xcb, 0x2c, 0x0e, 0x0e, 0xb6, 0x05,
|
|
1582
|
+
0xcb, 0x05, 0x04, 0xdb, 0x87, 0x63, 0x2c, 0xf3, 0xd8, 0xb4, 0xda, 0xe6, 0xe7, 0x05,
|
|
1583
|
+
0x76, 0x9d, 0x1d, 0xe3, 0x54, 0x27, 0x01, 0x23, 0xcb, 0x11, 0x45, 0x0e, 0xfc, 0x60,
|
|
1584
|
+
0xac, 0x47, 0x68, 0x3d, 0x7b, 0x8d, 0x0f, 0x81, 0x13, 0x65, 0x56, 0x5f, 0xd9, 0x8c,
|
|
1585
|
+
0x4c, 0x8e, 0xb9, 0x36, 0xbc, 0xab, 0x8d, 0x06, 0x9f, 0xc3, 0x3b, 0xd8, 0x01, 0xb0,
|
|
1586
|
+
0x3a, 0xde, 0xa2, 0xe1, 0xfb, 0xc5, 0xaa, 0x46, 0x3d, 0x08, 0xca, 0x19, 0x89, 0x6d,
|
|
1587
|
+
0x2b, 0xf5, 0x9a, 0x07, 0x1b, 0x85, 0x1e, 0x6c, 0x23, 0x90, 0x52, 0x17, 0x2f, 0x29,
|
|
1588
|
+
0x6b, 0xfb, 0x5e, 0x72, 0x40, 0x47, 0x90, 0xa2, 0x18, 0x10, 0x14, 0xf3, 0xb9, 0x4a,
|
|
1589
|
+
0x4e, 0x97, 0xd1, 0x17, 0xb4, 0x38, 0x13, 0x03, 0x68, 0xcc, 0x39, 0xdb, 0xb2, 0xd1,
|
|
1590
|
+
0x98, 0x06, 0x5a, 0xe3, 0x98, 0x65, 0x47, 0x92, 0x6c, 0xd2, 0x16, 0x2f, 0x40, 0xa2,
|
|
1591
|
+
0x9f, 0x0c, 0x3c, 0x87, 0x45, 0xc0, 0xf5, 0x0f, 0xba, 0x38, 0x52, 0xe5, 0x66, 0xd4,
|
|
1592
|
+
0x45, 0x75, 0xc2, 0x9d, 0x39, 0xa0, 0x3f, 0x0c, 0xda, 0x72, 0x19, 0x84, 0xb6, 0xf4,
|
|
1593
|
+
0x40, 0x59, 0x1f, 0x35, 0x5e, 0x12, 0xd4, 0x39, 0xff, 0x15, 0x0a, 0xab, 0x76, 0x13,
|
|
1594
|
+
0x49, 0x9d, 0xbd, 0x49, 0xad, 0xab, 0xc8, 0x67, 0x6e, 0xef, 0x02, 0x3b, 0x15, 0xb6,
|
|
1595
|
+
0x5b, 0xfc, 0x5c, 0xa0, 0x69, 0x48, 0x10, 0x9f, 0x23, 0xf3, 0x50, 0xdb, 0x82, 0x12,
|
|
1596
|
+
0x35, 0x35, 0xeb, 0x8a, 0x74, 0x33, 0xbd, 0xab, 0xcb, 0x90, 0x92, 0x71, 0xa6, 0xec,
|
|
1597
|
+
0xbc, 0xb5, 0x8b, 0x93, 0x6a, 0x88, 0xcd, 0x4e, 0x8f, 0x2e, 0x6f, 0xf5, 0x80, 0x01,
|
|
1598
|
+
0x75, 0xf1, 0x13, 0x25, 0x3d, 0x8f, 0xa9, 0xca, 0x88, 0x85, 0xc2, 0xf5, 0x52, 0xe6,
|
|
1599
|
+
0x57, 0xdc, 0x60, 0x3f, 0x25, 0x2e, 0x1a, 0x8e, 0x30, 0x8f, 0x76, 0xf0, 0xbe, 0x79,
|
|
1600
|
+
0xe2, 0xfb, 0x8f, 0x5d, 0x5f, 0xbb, 0xe2, 0xe3, 0x0e, 0xca, 0xdd, 0x22, 0x07, 0x23,
|
|
1601
|
+
0xc8, 0xc0, 0xae, 0xa8, 0x07, 0x8c, 0xdf, 0xcb, 0x38, 0x68, 0x26, 0x3f, 0xf8, 0xf0,
|
|
1602
|
+
0x94, 0x00, 0x54, 0xda, 0x48, 0x78, 0x18, 0x93, 0xa7, 0xe4, 0x9a, 0xd5, 0xaf, 0xf4,
|
|
1603
|
+
0xaf, 0x30, 0x0c, 0xd8, 0x04, 0xa6, 0xb6, 0x27, 0x9a, 0xb3, 0xff, 0x3a, 0xfb, 0x64,
|
|
1604
|
+
0x49, 0x1c, 0x85, 0x19, 0x4a, 0xab, 0x76, 0x0d, 0x58, 0xa6, 0x06, 0x65, 0x4f, 0x9f,
|
|
1605
|
+
0x44, 0x00, 0xe8, 0xb3, 0x85, 0x91, 0x35, 0x6f, 0xbf, 0x64, 0x25, 0xac, 0xa2, 0x6d,
|
|
1606
|
+
0xc8, 0x52, 0x44, 0x25, 0x9f, 0xf2, 0xb1, 0x9c, 0x41, 0xb9, 0xf9, 0x6f, 0x3c, 0xa9,
|
|
1607
|
+
0xec, 0x1d, 0xde, 0x43, 0x4d, 0xa7, 0xd2, 0xd3, 0x92, 0xb9, 0x05, 0xdd, 0xf3, 0xd1,
|
|
1608
|
+
0xf9, 0xaf, 0x93, 0xd1, 0xaf, 0x59, 0x50, 0xbd, 0x49, 0x3f, 0x5a, 0xa7, 0x31, 0xb4,
|
|
1609
|
+
0x05, 0x6d, 0xf3, 0x1b, 0xd2, 0x67, 0xb6, 0xb9, 0x0a, 0x07, 0x98, 0x31, 0xaa, 0xf5,
|
|
1610
|
+
0x79, 0xbe, 0x0a, 0x39, 0x01, 0x31, 0x37, 0xaa, 0xc6, 0xd4, 0x04, 0xf5, 0x18, 0xcf,
|
|
1611
|
+
0xd4, 0x68, 0x40, 0x64, 0x7e, 0x78, 0xbf, 0xe7, 0x06, 0xca, 0x4c, 0xf5, 0xe9, 0xc5,
|
|
1612
|
+
0x45, 0x3e, 0x9f, 0x7c, 0xfd, 0x2b, 0x8b, 0x4c, 0x8d, 0x16, 0x9a, 0x44, 0xe5, 0x5c,
|
|
1613
|
+
0x88, 0xd4, 0xa9, 0xa7, 0xf9, 0x47, 0x42, 0x41, 0x10, 0x92, 0xab, 0xbd, 0xf8, 0xb8,
|
|
1614
|
+
0x89, 0xe5, 0xc1, 0x99, 0xd0, 0x96, 0xe3, 0xf2, 0x47, 0x88,
|
|
1650
1615
|
];
|
|
1651
1616
|
|
|
1652
1617
|
let dcid = [0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08];
|
|
1653
1618
|
|
|
1654
1619
|
let frames = [
|
|
1655
|
-
0x06, 0x00, 0x40, 0xf1, 0x01, 0x00, 0x00, 0xed, 0x03, 0x03, 0xeb,
|
|
1656
|
-
|
|
1657
|
-
|
|
1658
|
-
|
|
1659
|
-
|
|
1660
|
-
|
|
1661
|
-
|
|
1662
|
-
|
|
1663
|
-
0x00,
|
|
1664
|
-
|
|
1665
|
-
|
|
1666
|
-
|
|
1667
|
-
|
|
1668
|
-
|
|
1669
|
-
|
|
1670
|
-
0x04,
|
|
1671
|
-
|
|
1672
|
-
|
|
1673
|
-
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x05, 0x04, 0x80, 0x00,
|
|
1674
|
-
0xff, 0xff, 0x07, 0x04, 0x80, 0x00, 0xff, 0xff, 0x08, 0x01, 0x10,
|
|
1675
|
-
0x01, 0x04, 0x80, 0x00, 0x75, 0x30, 0x09, 0x01, 0x10, 0x0f, 0x08,
|
|
1676
|
-
0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08, 0x06, 0x04, 0x80,
|
|
1677
|
-
0x00, 0xff, 0xff,
|
|
1620
|
+
0x06, 0x00, 0x40, 0xf1, 0x01, 0x00, 0x00, 0xed, 0x03, 0x03, 0xeb, 0xf8, 0xfa, 0x56,
|
|
1621
|
+
0xf1, 0x29, 0x39, 0xb9, 0x58, 0x4a, 0x38, 0x96, 0x47, 0x2e, 0xc4, 0x0b, 0xb8, 0x63,
|
|
1622
|
+
0xcf, 0xd3, 0xe8, 0x68, 0x04, 0xfe, 0x3a, 0x47, 0xf0, 0x6a, 0x2b, 0x69, 0x48, 0x4c,
|
|
1623
|
+
0x00, 0x00, 0x04, 0x13, 0x01, 0x13, 0x02, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
|
|
1624
|
+
0x10, 0x00, 0x0e, 0x00, 0x00, 0x0b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e,
|
|
1625
|
+
0x63, 0x6f, 0x6d, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06,
|
|
1626
|
+
0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x10, 0x00, 0x07, 0x00, 0x05, 0x04, 0x61,
|
|
1627
|
+
0x6c, 0x70, 0x6e, 0x00, 0x05, 0x00, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33,
|
|
1628
|
+
0x00, 0x26, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20, 0x93, 0x70, 0xb2, 0xc9, 0xca, 0xa4,
|
|
1629
|
+
0x7f, 0xba, 0xba, 0xf4, 0x55, 0x9f, 0xed, 0xba, 0x75, 0x3d, 0xe1, 0x71, 0xfa, 0x71,
|
|
1630
|
+
0xf5, 0x0f, 0x1c, 0xe1, 0x5d, 0x43, 0xe9, 0x94, 0xec, 0x74, 0xd7, 0x48, 0x00, 0x2b,
|
|
1631
|
+
0x00, 0x03, 0x02, 0x03, 0x04, 0x00, 0x0d, 0x00, 0x10, 0x00, 0x0e, 0x04, 0x03, 0x05,
|
|
1632
|
+
0x03, 0x06, 0x03, 0x02, 0x03, 0x08, 0x04, 0x08, 0x05, 0x08, 0x06, 0x00, 0x2d, 0x00,
|
|
1633
|
+
0x02, 0x01, 0x01, 0x00, 0x1c, 0x00, 0x02, 0x40, 0x01, 0xff, 0xa5, 0x00, 0x32, 0x04,
|
|
1634
|
+
0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x05, 0x04, 0x80, 0x00, 0xff,
|
|
1635
|
+
0xff, 0x07, 0x04, 0x80, 0x00, 0xff, 0xff, 0x08, 0x01, 0x10, 0x01, 0x04, 0x80, 0x00,
|
|
1636
|
+
0x75, 0x30, 0x09, 0x01, 0x10, 0x0f, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57,
|
|
1637
|
+
0x08, 0x06, 0x04, 0x80, 0x00, 0xff, 0xff,
|
|
1678
1638
|
];
|
|
1679
1639
|
|
|
1680
1640
|
assert_decrypt_initial_pkt(&mut pkt, &dcid, true, &frames, 2, 4);
|
|
@@ -1683,33 +1643,29 @@ mod tests {
|
|
|
1683
1643
|
#[test]
|
|
1684
1644
|
fn decrypt_server_initial_v1() {
|
|
1685
1645
|
let mut pkt = [
|
|
1686
|
-
0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50,
|
|
1687
|
-
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
|
|
1695
|
-
|
|
1696
|
-
0xaf, 0x2f, 0x58, 0x89, 0x18, 0x50, 0xab, 0xbd, 0xca, 0x3d, 0x20,
|
|
1697
|
-
0x39, 0x8c, 0x27, 0x64, 0x56, 0xcb, 0xc4, 0x21, 0x58, 0x40, 0x7d,
|
|
1698
|
-
0xd0, 0x74, 0xee,
|
|
1646
|
+
0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62,
|
|
1647
|
+
0xb5, 0x00, 0x40, 0x75, 0xc0, 0xd9, 0x5a, 0x48, 0x2c, 0xd0, 0x99, 0x1c, 0xd2, 0x5b,
|
|
1648
|
+
0x0a, 0xac, 0x40, 0x6a, 0x58, 0x16, 0xb6, 0x39, 0x41, 0x00, 0xf3, 0x7a, 0x1c, 0x69,
|
|
1649
|
+
0x79, 0x75, 0x54, 0x78, 0x0b, 0xb3, 0x8c, 0xc5, 0xa9, 0x9f, 0x5e, 0xde, 0x4c, 0xf7,
|
|
1650
|
+
0x3c, 0x3e, 0xc2, 0x49, 0x3a, 0x18, 0x39, 0xb3, 0xdb, 0xcb, 0xa3, 0xf6, 0xea, 0x46,
|
|
1651
|
+
0xc5, 0xb7, 0x68, 0x4d, 0xf3, 0x54, 0x8e, 0x7d, 0xde, 0xb9, 0xc3, 0xbf, 0x9c, 0x73,
|
|
1652
|
+
0xcc, 0x3f, 0x3b, 0xde, 0xd7, 0x4b, 0x56, 0x2b, 0xfb, 0x19, 0xfb, 0x84, 0x02, 0x2f,
|
|
1653
|
+
0x8e, 0xf4, 0xcd, 0xd9, 0x37, 0x95, 0xd7, 0x7d, 0x06, 0xed, 0xbb, 0x7a, 0xaf, 0x2f,
|
|
1654
|
+
0x58, 0x89, 0x18, 0x50, 0xab, 0xbd, 0xca, 0x3d, 0x20, 0x39, 0x8c, 0x27, 0x64, 0x56,
|
|
1655
|
+
0xcb, 0xc4, 0x21, 0x58, 0x40, 0x7d, 0xd0, 0x74, 0xee,
|
|
1699
1656
|
];
|
|
1700
1657
|
|
|
1701
1658
|
let dcid = [0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08];
|
|
1702
1659
|
|
|
1703
1660
|
let frames = [
|
|
1704
|
-
0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x40, 0x5a, 0x02, 0x00,
|
|
1705
|
-
|
|
1706
|
-
|
|
1707
|
-
|
|
1708
|
-
|
|
1709
|
-
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
0xf3, 0x2b, 0xb9, 0xda, 0x1a, 0x00, 0x2b, 0x00, 0x02, 0x03, 0x04,
|
|
1661
|
+
0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x40, 0x5a, 0x02, 0x00, 0x00, 0x56, 0x03,
|
|
1662
|
+
0x03, 0xee, 0xfc, 0xe7, 0xf7, 0xb3, 0x7b, 0xa1, 0xd1, 0x63, 0x2e, 0x96, 0x67, 0x78,
|
|
1663
|
+
0x25, 0xdd, 0xf7, 0x39, 0x88, 0xcf, 0xc7, 0x98, 0x25, 0xdf, 0x56, 0x6d, 0xc5, 0x43,
|
|
1664
|
+
0x0b, 0x9a, 0x04, 0x5a, 0x12, 0x00, 0x13, 0x01, 0x00, 0x00, 0x2e, 0x00, 0x33, 0x00,
|
|
1665
|
+
0x24, 0x00, 0x1d, 0x00, 0x20, 0x9d, 0x3c, 0x94, 0x0d, 0x89, 0x69, 0x0b, 0x84, 0xd0,
|
|
1666
|
+
0x8a, 0x60, 0x99, 0x3c, 0x14, 0x4e, 0xca, 0x68, 0x4d, 0x10, 0x81, 0x28, 0x7c, 0x83,
|
|
1667
|
+
0x4d, 0x53, 0x11, 0xbc, 0xf3, 0x2b, 0xb9, 0xda, 0x1a, 0x00, 0x2b, 0x00, 0x02, 0x03,
|
|
1668
|
+
0x04,
|
|
1713
1669
|
];
|
|
1714
1670
|
|
|
1715
1671
|
assert_decrypt_initial_pkt(&mut pkt, &dcid, false, &frames, 1, 2);
|
|
@@ -1718,14 +1674,14 @@ mod tests {
|
|
|
1718
1674
|
#[test]
|
|
1719
1675
|
fn decrypt_chacha20() {
|
|
1720
1676
|
let secret = [
|
|
1721
|
-
0x9a, 0xc3, 0x12, 0xa7, 0xf8, 0x77, 0x46, 0x8e, 0xbe, 0x69, 0x42,
|
|
1722
|
-
|
|
1723
|
-
|
|
1677
|
+
0x9a, 0xc3, 0x12, 0xa7, 0xf8, 0x77, 0x46, 0x8e, 0xbe, 0x69, 0x42, 0x27, 0x48, 0xad,
|
|
1678
|
+
0x00, 0xa1, 0x54, 0x43, 0xf1, 0x82, 0x03, 0xa0, 0x7d, 0x60, 0x60, 0xf6, 0x88, 0xf3,
|
|
1679
|
+
0x0f, 0x21, 0x63, 0x2b,
|
|
1724
1680
|
];
|
|
1725
1681
|
|
|
1726
1682
|
let mut pkt = [
|
|
1727
|
-
0x4c, 0xfe, 0x41, 0x89, 0x65, 0x5e, 0x5c, 0xd5, 0x5c, 0x41, 0xf6,
|
|
1728
|
-
|
|
1683
|
+
0x4c, 0xfe, 0x41, 0x89, 0x65, 0x5e, 0x5c, 0xd5, 0x5c, 0x41, 0xf6, 0x90, 0x80, 0x57,
|
|
1684
|
+
0x5d, 0x79, 0x99, 0xc2, 0x5a, 0x5b, 0xfb,
|
|
1729
1685
|
];
|
|
1730
1686
|
|
|
1731
1687
|
let mut b = octets::OctetsMut::with_slice(&mut pkt);
|
|
@@ -1745,16 +1701,20 @@ mod tests {
|
|
|
1745
1701
|
let pn = decode_pkt_num(654_360_564, hdr.pkt_num, hdr.pkt_num_len);
|
|
1746
1702
|
assert_eq!(pn, 654_360_564);
|
|
1747
1703
|
|
|
1748
|
-
let payload =
|
|
1749
|
-
decrypt_pkt(&mut b, pn, hdr.pkt_num_len, payload_len, &aead).unwrap();
|
|
1704
|
+
let payload = decrypt_pkt(&mut b, pn, hdr.pkt_num_len, payload_len, &aead).unwrap();
|
|
1750
1705
|
|
|
1751
1706
|
let payload = payload.as_ref();
|
|
1752
1707
|
assert_eq!(&payload, &[0x01]);
|
|
1753
1708
|
}
|
|
1754
1709
|
|
|
1755
1710
|
fn assert_encrypt_initial_pkt(
|
|
1756
|
-
header: &mut [u8],
|
|
1757
|
-
|
|
1711
|
+
header: &mut [u8],
|
|
1712
|
+
dcid: &[u8],
|
|
1713
|
+
frames: &[u8],
|
|
1714
|
+
pn: u64,
|
|
1715
|
+
pn_len: usize,
|
|
1716
|
+
is_server: bool,
|
|
1717
|
+
expected_pkt: &[u8],
|
|
1758
1718
|
) {
|
|
1759
1719
|
let mut b = octets::OctetsMut::with_slice(header);
|
|
1760
1720
|
|
|
@@ -1766,13 +1726,8 @@ mod tests {
|
|
|
1766
1726
|
|
|
1767
1727
|
b.put_bytes(header).unwrap();
|
|
1768
1728
|
|
|
1769
|
-
let (_, mut aead) =
|
|
1770
|
-
dcid,
|
|
1771
|
-
hdr.version,
|
|
1772
|
-
is_server,
|
|
1773
|
-
false,
|
|
1774
|
-
)
|
|
1775
|
-
.unwrap();
|
|
1729
|
+
let (_, mut aead) =
|
|
1730
|
+
crypto::derive_initial_key_material(dcid, hdr.version, is_server, false).unwrap();
|
|
1776
1731
|
|
|
1777
1732
|
let payload_len = frames.len();
|
|
1778
1733
|
|
|
@@ -1798,280 +1753,221 @@ mod tests {
|
|
|
1798
1753
|
#[test]
|
|
1799
1754
|
fn encrypt_client_initial_v1() {
|
|
1800
1755
|
let mut header = [
|
|
1801
|
-
0xc3, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e,
|
|
1802
|
-
|
|
1756
|
+
0xc3, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08,
|
|
1757
|
+
0x00, 0x00, 0x44, 0x9e, 0x00, 0x00, 0x00, 0x02,
|
|
1803
1758
|
];
|
|
1804
1759
|
|
|
1805
1760
|
let dcid = [0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08];
|
|
1806
1761
|
|
|
1807
1762
|
let frames = [
|
|
1808
|
-
0x06, 0x00, 0x40, 0xf1, 0x01, 0x00, 0x00, 0xed, 0x03, 0x03, 0xeb,
|
|
1809
|
-
|
|
1810
|
-
|
|
1811
|
-
|
|
1812
|
-
|
|
1813
|
-
|
|
1814
|
-
|
|
1815
|
-
|
|
1816
|
-
0x00,
|
|
1817
|
-
|
|
1818
|
-
|
|
1819
|
-
|
|
1820
|
-
|
|
1821
|
-
|
|
1822
|
-
|
|
1823
|
-
0x04,
|
|
1824
|
-
|
|
1825
|
-
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
0x00,
|
|
1831
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1832
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1833
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1834
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1835
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1836
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1837
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1838
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1839
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1840
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1841
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1842
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1843
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1844
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1845
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1846
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1847
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1848
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1849
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1850
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1851
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1852
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1853
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1854
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1855
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1856
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1857
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1858
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1859
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1860
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1861
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1862
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1863
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1864
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1865
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1866
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1867
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1868
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1869
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1870
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1871
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1872
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1873
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1874
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1875
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1876
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1877
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1878
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1879
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1880
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1881
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1882
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1883
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1884
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1885
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1886
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1887
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1888
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1889
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1890
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1891
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1892
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1893
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1894
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1895
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1896
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1897
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1898
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1899
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1900
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1901
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1902
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1903
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1904
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1905
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1906
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1907
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1908
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1909
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1910
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1911
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1912
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1913
|
-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1763
|
+
0x06, 0x00, 0x40, 0xf1, 0x01, 0x00, 0x00, 0xed, 0x03, 0x03, 0xeb, 0xf8, 0xfa, 0x56,
|
|
1764
|
+
0xf1, 0x29, 0x39, 0xb9, 0x58, 0x4a, 0x38, 0x96, 0x47, 0x2e, 0xc4, 0x0b, 0xb8, 0x63,
|
|
1765
|
+
0xcf, 0xd3, 0xe8, 0x68, 0x04, 0xfe, 0x3a, 0x47, 0xf0, 0x6a, 0x2b, 0x69, 0x48, 0x4c,
|
|
1766
|
+
0x00, 0x00, 0x04, 0x13, 0x01, 0x13, 0x02, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
|
|
1767
|
+
0x10, 0x00, 0x0e, 0x00, 0x00, 0x0b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e,
|
|
1768
|
+
0x63, 0x6f, 0x6d, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06,
|
|
1769
|
+
0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x10, 0x00, 0x07, 0x00, 0x05, 0x04, 0x61,
|
|
1770
|
+
0x6c, 0x70, 0x6e, 0x00, 0x05, 0x00, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33,
|
|
1771
|
+
0x00, 0x26, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20, 0x93, 0x70, 0xb2, 0xc9, 0xca, 0xa4,
|
|
1772
|
+
0x7f, 0xba, 0xba, 0xf4, 0x55, 0x9f, 0xed, 0xba, 0x75, 0x3d, 0xe1, 0x71, 0xfa, 0x71,
|
|
1773
|
+
0xf5, 0x0f, 0x1c, 0xe1, 0x5d, 0x43, 0xe9, 0x94, 0xec, 0x74, 0xd7, 0x48, 0x00, 0x2b,
|
|
1774
|
+
0x00, 0x03, 0x02, 0x03, 0x04, 0x00, 0x0d, 0x00, 0x10, 0x00, 0x0e, 0x04, 0x03, 0x05,
|
|
1775
|
+
0x03, 0x06, 0x03, 0x02, 0x03, 0x08, 0x04, 0x08, 0x05, 0x08, 0x06, 0x00, 0x2d, 0x00,
|
|
1776
|
+
0x02, 0x01, 0x01, 0x00, 0x1c, 0x00, 0x02, 0x40, 0x01, 0xff, 0xa5, 0x00, 0x32, 0x04,
|
|
1777
|
+
0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x05, 0x04, 0x80, 0x00, 0xff,
|
|
1778
|
+
0xff, 0x07, 0x04, 0x80, 0x00, 0xff, 0xff, 0x08, 0x01, 0x10, 0x01, 0x04, 0x80, 0x00,
|
|
1779
|
+
0x75, 0x30, 0x09, 0x01, 0x10, 0x0f, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57,
|
|
1780
|
+
0x08, 0x06, 0x04, 0x80, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1781
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1782
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1783
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1784
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1785
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1786
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1787
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1788
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1789
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1790
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1791
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1792
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1793
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1794
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1795
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1796
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1797
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1798
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1799
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1800
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1801
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1802
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1803
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1804
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1805
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1806
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1807
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1808
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1809
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1810
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1811
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1812
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1813
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1814
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1815
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1816
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1817
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1818
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1819
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1820
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1821
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1822
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1823
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1824
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1825
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1826
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1827
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1828
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1829
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1830
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1831
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1832
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1833
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1834
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1835
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1836
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1837
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1838
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1839
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1840
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1841
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1842
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1843
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1844
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1845
|
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
1914
1846
|
];
|
|
1915
1847
|
|
|
1916
1848
|
let pkt = [
|
|
1917
|
-
0xc0, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e,
|
|
1918
|
-
|
|
1919
|
-
|
|
1920
|
-
|
|
1921
|
-
|
|
1922
|
-
|
|
1923
|
-
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
1927
|
-
|
|
1928
|
-
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
|
|
1933
|
-
|
|
1934
|
-
|
|
1935
|
-
|
|
1936
|
-
|
|
1937
|
-
|
|
1938
|
-
0xf6,
|
|
1939
|
-
|
|
1940
|
-
|
|
1941
|
-
|
|
1942
|
-
|
|
1943
|
-
|
|
1944
|
-
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
|
|
1948
|
-
|
|
1949
|
-
|
|
1950
|
-
|
|
1951
|
-
|
|
1952
|
-
|
|
1953
|
-
0x8b,
|
|
1954
|
-
|
|
1955
|
-
|
|
1956
|
-
|
|
1957
|
-
|
|
1958
|
-
|
|
1959
|
-
|
|
1960
|
-
|
|
1961
|
-
|
|
1962
|
-
|
|
1963
|
-
|
|
1964
|
-
|
|
1965
|
-
|
|
1966
|
-
|
|
1967
|
-
|
|
1968
|
-
|
|
1969
|
-
|
|
1970
|
-
|
|
1971
|
-
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1975
|
-
|
|
1976
|
-
|
|
1977
|
-
|
|
1978
|
-
|
|
1979
|
-
|
|
1980
|
-
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
|
|
1990
|
-
|
|
1991
|
-
|
|
1992
|
-
|
|
1993
|
-
|
|
1994
|
-
|
|
1995
|
-
|
|
1996
|
-
|
|
1997
|
-
|
|
1998
|
-
|
|
1999
|
-
0xd4,
|
|
2000
|
-
|
|
2001
|
-
|
|
2002
|
-
|
|
2003
|
-
0xcb, 0x90, 0x92, 0x71, 0xa6, 0xec, 0xbc, 0xb5, 0x8b, 0x93, 0x6a,
|
|
2004
|
-
0x88, 0xcd, 0x4e, 0x8f, 0x2e, 0x6f, 0xf5, 0x80, 0x01, 0x75, 0xf1,
|
|
2005
|
-
0x13, 0x25, 0x3d, 0x8f, 0xa9, 0xca, 0x88, 0x85, 0xc2, 0xf5, 0x52,
|
|
2006
|
-
0xe6, 0x57, 0xdc, 0x60, 0x3f, 0x25, 0x2e, 0x1a, 0x8e, 0x30, 0x8f,
|
|
2007
|
-
0x76, 0xf0, 0xbe, 0x79, 0xe2, 0xfb, 0x8f, 0x5d, 0x5f, 0xbb, 0xe2,
|
|
2008
|
-
0xe3, 0x0e, 0xca, 0xdd, 0x22, 0x07, 0x23, 0xc8, 0xc0, 0xae, 0xa8,
|
|
2009
|
-
0x07, 0x8c, 0xdf, 0xcb, 0x38, 0x68, 0x26, 0x3f, 0xf8, 0xf0, 0x94,
|
|
2010
|
-
0x00, 0x54, 0xda, 0x48, 0x78, 0x18, 0x93, 0xa7, 0xe4, 0x9a, 0xd5,
|
|
2011
|
-
0xaf, 0xf4, 0xaf, 0x30, 0x0c, 0xd8, 0x04, 0xa6, 0xb6, 0x27, 0x9a,
|
|
2012
|
-
0xb3, 0xff, 0x3a, 0xfb, 0x64, 0x49, 0x1c, 0x85, 0x19, 0x4a, 0xab,
|
|
2013
|
-
0x76, 0x0d, 0x58, 0xa6, 0x06, 0x65, 0x4f, 0x9f, 0x44, 0x00, 0xe8,
|
|
2014
|
-
0xb3, 0x85, 0x91, 0x35, 0x6f, 0xbf, 0x64, 0x25, 0xac, 0xa2, 0x6d,
|
|
2015
|
-
0xc8, 0x52, 0x44, 0x25, 0x9f, 0xf2, 0xb1, 0x9c, 0x41, 0xb9, 0xf9,
|
|
2016
|
-
0x6f, 0x3c, 0xa9, 0xec, 0x1d, 0xde, 0x43, 0x4d, 0xa7, 0xd2, 0xd3,
|
|
2017
|
-
0x92, 0xb9, 0x05, 0xdd, 0xf3, 0xd1, 0xf9, 0xaf, 0x93, 0xd1, 0xaf,
|
|
2018
|
-
0x59, 0x50, 0xbd, 0x49, 0x3f, 0x5a, 0xa7, 0x31, 0xb4, 0x05, 0x6d,
|
|
2019
|
-
0xf3, 0x1b, 0xd2, 0x67, 0xb6, 0xb9, 0x0a, 0x07, 0x98, 0x31, 0xaa,
|
|
2020
|
-
0xf5, 0x79, 0xbe, 0x0a, 0x39, 0x01, 0x31, 0x37, 0xaa, 0xc6, 0xd4,
|
|
2021
|
-
0x04, 0xf5, 0x18, 0xcf, 0xd4, 0x68, 0x40, 0x64, 0x7e, 0x78, 0xbf,
|
|
2022
|
-
0xe7, 0x06, 0xca, 0x4c, 0xf5, 0xe9, 0xc5, 0x45, 0x3e, 0x9f, 0x7c,
|
|
2023
|
-
0xfd, 0x2b, 0x8b, 0x4c, 0x8d, 0x16, 0x9a, 0x44, 0xe5, 0x5c, 0x88,
|
|
2024
|
-
0xd4, 0xa9, 0xa7, 0xf9, 0x47, 0x42, 0x41, 0x10, 0x92, 0xab, 0xbd,
|
|
2025
|
-
0xf8, 0xb8, 0x89, 0xe5, 0xc1, 0x99, 0xd0, 0x96, 0xe3, 0xf2, 0x47,
|
|
2026
|
-
0x88,
|
|
1849
|
+
0xc0, 0x00, 0x00, 0x00, 0x01, 0x08, 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08,
|
|
1850
|
+
0x00, 0x00, 0x44, 0x9e, 0x7b, 0x9a, 0xec, 0x34, 0xd1, 0xb1, 0xc9, 0x8d, 0xd7, 0x68,
|
|
1851
|
+
0x9f, 0xb8, 0xec, 0x11, 0xd2, 0x42, 0xb1, 0x23, 0xdc, 0x9b, 0xd8, 0xba, 0xb9, 0x36,
|
|
1852
|
+
0xb4, 0x7d, 0x92, 0xec, 0x35, 0x6c, 0x0b, 0xab, 0x7d, 0xf5, 0x97, 0x6d, 0x27, 0xcd,
|
|
1853
|
+
0x44, 0x9f, 0x63, 0x30, 0x00, 0x99, 0xf3, 0x99, 0x1c, 0x26, 0x0e, 0xc4, 0xc6, 0x0d,
|
|
1854
|
+
0x17, 0xb3, 0x1f, 0x84, 0x29, 0x15, 0x7b, 0xb3, 0x5a, 0x12, 0x82, 0xa6, 0x43, 0xa8,
|
|
1855
|
+
0xd2, 0x26, 0x2c, 0xad, 0x67, 0x50, 0x0c, 0xad, 0xb8, 0xe7, 0x37, 0x8c, 0x8e, 0xb7,
|
|
1856
|
+
0x53, 0x9e, 0xc4, 0xd4, 0x90, 0x5f, 0xed, 0x1b, 0xee, 0x1f, 0xc8, 0xaa, 0xfb, 0xa1,
|
|
1857
|
+
0x7c, 0x75, 0x0e, 0x2c, 0x7a, 0xce, 0x01, 0xe6, 0x00, 0x5f, 0x80, 0xfc, 0xb7, 0xdf,
|
|
1858
|
+
0x62, 0x12, 0x30, 0xc8, 0x37, 0x11, 0xb3, 0x93, 0x43, 0xfa, 0x02, 0x8c, 0xea, 0x7f,
|
|
1859
|
+
0x7f, 0xb5, 0xff, 0x89, 0xea, 0xc2, 0x30, 0x82, 0x49, 0xa0, 0x22, 0x52, 0x15, 0x5e,
|
|
1860
|
+
0x23, 0x47, 0xb6, 0x3d, 0x58, 0xc5, 0x45, 0x7a, 0xfd, 0x84, 0xd0, 0x5d, 0xff, 0xfd,
|
|
1861
|
+
0xb2, 0x03, 0x92, 0x84, 0x4a, 0xe8, 0x12, 0x15, 0x46, 0x82, 0xe9, 0xcf, 0x01, 0x2f,
|
|
1862
|
+
0x90, 0x21, 0xa6, 0xf0, 0xbe, 0x17, 0xdd, 0xd0, 0xc2, 0x08, 0x4d, 0xce, 0x25, 0xff,
|
|
1863
|
+
0x9b, 0x06, 0xcd, 0xe5, 0x35, 0xd0, 0xf9, 0x20, 0xa2, 0xdb, 0x1b, 0xf3, 0x62, 0xc2,
|
|
1864
|
+
0x3e, 0x59, 0x6d, 0xee, 0x38, 0xf5, 0xa6, 0xcf, 0x39, 0x48, 0x83, 0x8a, 0x3a, 0xec,
|
|
1865
|
+
0x4e, 0x15, 0xda, 0xf8, 0x50, 0x0a, 0x6e, 0xf6, 0x9e, 0xc4, 0xe3, 0xfe, 0xb6, 0xb1,
|
|
1866
|
+
0xd9, 0x8e, 0x61, 0x0a, 0xc8, 0xb7, 0xec, 0x3f, 0xaf, 0x6a, 0xd7, 0x60, 0xb7, 0xba,
|
|
1867
|
+
0xd1, 0xdb, 0x4b, 0xa3, 0x48, 0x5e, 0x8a, 0x94, 0xdc, 0x25, 0x0a, 0xe3, 0xfd, 0xb4,
|
|
1868
|
+
0x1e, 0xd1, 0x5f, 0xb6, 0xa8, 0xe5, 0xeb, 0xa0, 0xfc, 0x3d, 0xd6, 0x0b, 0xc8, 0xe3,
|
|
1869
|
+
0x0c, 0x5c, 0x42, 0x87, 0xe5, 0x38, 0x05, 0xdb, 0x05, 0x9a, 0xe0, 0x64, 0x8d, 0xb2,
|
|
1870
|
+
0xf6, 0x42, 0x64, 0xed, 0x5e, 0x39, 0xbe, 0x2e, 0x20, 0xd8, 0x2d, 0xf5, 0x66, 0xda,
|
|
1871
|
+
0x8d, 0xd5, 0x99, 0x8c, 0xca, 0xbd, 0xae, 0x05, 0x30, 0x60, 0xae, 0x6c, 0x7b, 0x43,
|
|
1872
|
+
0x78, 0xe8, 0x46, 0xd2, 0x9f, 0x37, 0xed, 0x7b, 0x4e, 0xa9, 0xec, 0x5d, 0x82, 0xe7,
|
|
1873
|
+
0x96, 0x1b, 0x7f, 0x25, 0xa9, 0x32, 0x38, 0x51, 0xf6, 0x81, 0xd5, 0x82, 0x36, 0x3a,
|
|
1874
|
+
0xa5, 0xf8, 0x99, 0x37, 0xf5, 0xa6, 0x72, 0x58, 0xbf, 0x63, 0xad, 0x6f, 0x1a, 0x0b,
|
|
1875
|
+
0x1d, 0x96, 0xdb, 0xd4, 0xfa, 0xdd, 0xfc, 0xef, 0xc5, 0x26, 0x6b, 0xa6, 0x61, 0x17,
|
|
1876
|
+
0x22, 0x39, 0x5c, 0x90, 0x65, 0x56, 0xbe, 0x52, 0xaf, 0xe3, 0xf5, 0x65, 0x63, 0x6a,
|
|
1877
|
+
0xd1, 0xb1, 0x7d, 0x50, 0x8b, 0x73, 0xd8, 0x74, 0x3e, 0xeb, 0x52, 0x4b, 0xe2, 0x2b,
|
|
1878
|
+
0x3d, 0xcb, 0xc2, 0xc7, 0x46, 0x8d, 0x54, 0x11, 0x9c, 0x74, 0x68, 0x44, 0x9a, 0x13,
|
|
1879
|
+
0xd8, 0xe3, 0xb9, 0x58, 0x11, 0xa1, 0x98, 0xf3, 0x49, 0x1d, 0xe3, 0xe7, 0xfe, 0x94,
|
|
1880
|
+
0x2b, 0x33, 0x04, 0x07, 0xab, 0xf8, 0x2a, 0x4e, 0xd7, 0xc1, 0xb3, 0x11, 0x66, 0x3a,
|
|
1881
|
+
0xc6, 0x98, 0x90, 0xf4, 0x15, 0x70, 0x15, 0x85, 0x3d, 0x91, 0xe9, 0x23, 0x03, 0x7c,
|
|
1882
|
+
0x22, 0x7a, 0x33, 0xcd, 0xd5, 0xec, 0x28, 0x1c, 0xa3, 0xf7, 0x9c, 0x44, 0x54, 0x6b,
|
|
1883
|
+
0x9d, 0x90, 0xca, 0x00, 0xf0, 0x64, 0xc9, 0x9e, 0x3d, 0xd9, 0x79, 0x11, 0xd3, 0x9f,
|
|
1884
|
+
0xe9, 0xc5, 0xd0, 0xb2, 0x3a, 0x22, 0x9a, 0x23, 0x4c, 0xb3, 0x61, 0x86, 0xc4, 0x81,
|
|
1885
|
+
0x9e, 0x8b, 0x9c, 0x59, 0x27, 0x72, 0x66, 0x32, 0x29, 0x1d, 0x6a, 0x41, 0x82, 0x11,
|
|
1886
|
+
0xcc, 0x29, 0x62, 0xe2, 0x0f, 0xe4, 0x7f, 0xeb, 0x3e, 0xdf, 0x33, 0x0f, 0x2c, 0x60,
|
|
1887
|
+
0x3a, 0x9d, 0x48, 0xc0, 0xfc, 0xb5, 0x69, 0x9d, 0xbf, 0xe5, 0x89, 0x64, 0x25, 0xc5,
|
|
1888
|
+
0xba, 0xc4, 0xae, 0xe8, 0x2e, 0x57, 0xa8, 0x5a, 0xaf, 0x4e, 0x25, 0x13, 0xe4, 0xf0,
|
|
1889
|
+
0x57, 0x96, 0xb0, 0x7b, 0xa2, 0xee, 0x47, 0xd8, 0x05, 0x06, 0xf8, 0xd2, 0xc2, 0x5e,
|
|
1890
|
+
0x50, 0xfd, 0x14, 0xde, 0x71, 0xe6, 0xc4, 0x18, 0x55, 0x93, 0x02, 0xf9, 0x39, 0xb0,
|
|
1891
|
+
0xe1, 0xab, 0xd5, 0x76, 0xf2, 0x79, 0xc4, 0xb2, 0xe0, 0xfe, 0xb8, 0x5c, 0x1f, 0x28,
|
|
1892
|
+
0xff, 0x18, 0xf5, 0x88, 0x91, 0xff, 0xef, 0x13, 0x2e, 0xef, 0x2f, 0xa0, 0x93, 0x46,
|
|
1893
|
+
0xae, 0xe3, 0x3c, 0x28, 0xeb, 0x13, 0x0f, 0xf2, 0x8f, 0x5b, 0x76, 0x69, 0x53, 0x33,
|
|
1894
|
+
0x41, 0x13, 0x21, 0x19, 0x96, 0xd2, 0x00, 0x11, 0xa1, 0x98, 0xe3, 0xfc, 0x43, 0x3f,
|
|
1895
|
+
0x9f, 0x25, 0x41, 0x01, 0x0a, 0xe1, 0x7c, 0x1b, 0xf2, 0x02, 0x58, 0x0f, 0x60, 0x47,
|
|
1896
|
+
0x47, 0x2f, 0xb3, 0x68, 0x57, 0xfe, 0x84, 0x3b, 0x19, 0xf5, 0x98, 0x40, 0x09, 0xdd,
|
|
1897
|
+
0xc3, 0x24, 0x04, 0x4e, 0x84, 0x7a, 0x4f, 0x4a, 0x0a, 0xb3, 0x4f, 0x71, 0x95, 0x95,
|
|
1898
|
+
0xde, 0x37, 0x25, 0x2d, 0x62, 0x35, 0x36, 0x5e, 0x9b, 0x84, 0x39, 0x2b, 0x06, 0x10,
|
|
1899
|
+
0x85, 0x34, 0x9d, 0x73, 0x20, 0x3a, 0x4a, 0x13, 0xe9, 0x6f, 0x54, 0x32, 0xec, 0x0f,
|
|
1900
|
+
0xd4, 0xa1, 0xee, 0x65, 0xac, 0xcd, 0xd5, 0xe3, 0x90, 0x4d, 0xf5, 0x4c, 0x1d, 0xa5,
|
|
1901
|
+
0x10, 0xb0, 0xff, 0x20, 0xdc, 0xc0, 0xc7, 0x7f, 0xcb, 0x2c, 0x0e, 0x0e, 0xb6, 0x05,
|
|
1902
|
+
0xcb, 0x05, 0x04, 0xdb, 0x87, 0x63, 0x2c, 0xf3, 0xd8, 0xb4, 0xda, 0xe6, 0xe7, 0x05,
|
|
1903
|
+
0x76, 0x9d, 0x1d, 0xe3, 0x54, 0x27, 0x01, 0x23, 0xcb, 0x11, 0x45, 0x0e, 0xfc, 0x60,
|
|
1904
|
+
0xac, 0x47, 0x68, 0x3d, 0x7b, 0x8d, 0x0f, 0x81, 0x13, 0x65, 0x56, 0x5f, 0xd9, 0x8c,
|
|
1905
|
+
0x4c, 0x8e, 0xb9, 0x36, 0xbc, 0xab, 0x8d, 0x06, 0x9f, 0xc3, 0x3b, 0xd8, 0x01, 0xb0,
|
|
1906
|
+
0x3a, 0xde, 0xa2, 0xe1, 0xfb, 0xc5, 0xaa, 0x46, 0x3d, 0x08, 0xca, 0x19, 0x89, 0x6d,
|
|
1907
|
+
0x2b, 0xf5, 0x9a, 0x07, 0x1b, 0x85, 0x1e, 0x6c, 0x23, 0x90, 0x52, 0x17, 0x2f, 0x29,
|
|
1908
|
+
0x6b, 0xfb, 0x5e, 0x72, 0x40, 0x47, 0x90, 0xa2, 0x18, 0x10, 0x14, 0xf3, 0xb9, 0x4a,
|
|
1909
|
+
0x4e, 0x97, 0xd1, 0x17, 0xb4, 0x38, 0x13, 0x03, 0x68, 0xcc, 0x39, 0xdb, 0xb2, 0xd1,
|
|
1910
|
+
0x98, 0x06, 0x5a, 0xe3, 0x98, 0x65, 0x47, 0x92, 0x6c, 0xd2, 0x16, 0x2f, 0x40, 0xa2,
|
|
1911
|
+
0x9f, 0x0c, 0x3c, 0x87, 0x45, 0xc0, 0xf5, 0x0f, 0xba, 0x38, 0x52, 0xe5, 0x66, 0xd4,
|
|
1912
|
+
0x45, 0x75, 0xc2, 0x9d, 0x39, 0xa0, 0x3f, 0x0c, 0xda, 0x72, 0x19, 0x84, 0xb6, 0xf4,
|
|
1913
|
+
0x40, 0x59, 0x1f, 0x35, 0x5e, 0x12, 0xd4, 0x39, 0xff, 0x15, 0x0a, 0xab, 0x76, 0x13,
|
|
1914
|
+
0x49, 0x9d, 0xbd, 0x49, 0xad, 0xab, 0xc8, 0x67, 0x6e, 0xef, 0x02, 0x3b, 0x15, 0xb6,
|
|
1915
|
+
0x5b, 0xfc, 0x5c, 0xa0, 0x69, 0x48, 0x10, 0x9f, 0x23, 0xf3, 0x50, 0xdb, 0x82, 0x12,
|
|
1916
|
+
0x35, 0x35, 0xeb, 0x8a, 0x74, 0x33, 0xbd, 0xab, 0xcb, 0x90, 0x92, 0x71, 0xa6, 0xec,
|
|
1917
|
+
0xbc, 0xb5, 0x8b, 0x93, 0x6a, 0x88, 0xcd, 0x4e, 0x8f, 0x2e, 0x6f, 0xf5, 0x80, 0x01,
|
|
1918
|
+
0x75, 0xf1, 0x13, 0x25, 0x3d, 0x8f, 0xa9, 0xca, 0x88, 0x85, 0xc2, 0xf5, 0x52, 0xe6,
|
|
1919
|
+
0x57, 0xdc, 0x60, 0x3f, 0x25, 0x2e, 0x1a, 0x8e, 0x30, 0x8f, 0x76, 0xf0, 0xbe, 0x79,
|
|
1920
|
+
0xe2, 0xfb, 0x8f, 0x5d, 0x5f, 0xbb, 0xe2, 0xe3, 0x0e, 0xca, 0xdd, 0x22, 0x07, 0x23,
|
|
1921
|
+
0xc8, 0xc0, 0xae, 0xa8, 0x07, 0x8c, 0xdf, 0xcb, 0x38, 0x68, 0x26, 0x3f, 0xf8, 0xf0,
|
|
1922
|
+
0x94, 0x00, 0x54, 0xda, 0x48, 0x78, 0x18, 0x93, 0xa7, 0xe4, 0x9a, 0xd5, 0xaf, 0xf4,
|
|
1923
|
+
0xaf, 0x30, 0x0c, 0xd8, 0x04, 0xa6, 0xb6, 0x27, 0x9a, 0xb3, 0xff, 0x3a, 0xfb, 0x64,
|
|
1924
|
+
0x49, 0x1c, 0x85, 0x19, 0x4a, 0xab, 0x76, 0x0d, 0x58, 0xa6, 0x06, 0x65, 0x4f, 0x9f,
|
|
1925
|
+
0x44, 0x00, 0xe8, 0xb3, 0x85, 0x91, 0x35, 0x6f, 0xbf, 0x64, 0x25, 0xac, 0xa2, 0x6d,
|
|
1926
|
+
0xc8, 0x52, 0x44, 0x25, 0x9f, 0xf2, 0xb1, 0x9c, 0x41, 0xb9, 0xf9, 0x6f, 0x3c, 0xa9,
|
|
1927
|
+
0xec, 0x1d, 0xde, 0x43, 0x4d, 0xa7, 0xd2, 0xd3, 0x92, 0xb9, 0x05, 0xdd, 0xf3, 0xd1,
|
|
1928
|
+
0xf9, 0xaf, 0x93, 0xd1, 0xaf, 0x59, 0x50, 0xbd, 0x49, 0x3f, 0x5a, 0xa7, 0x31, 0xb4,
|
|
1929
|
+
0x05, 0x6d, 0xf3, 0x1b, 0xd2, 0x67, 0xb6, 0xb9, 0x0a, 0x07, 0x98, 0x31, 0xaa, 0xf5,
|
|
1930
|
+
0x79, 0xbe, 0x0a, 0x39, 0x01, 0x31, 0x37, 0xaa, 0xc6, 0xd4, 0x04, 0xf5, 0x18, 0xcf,
|
|
1931
|
+
0xd4, 0x68, 0x40, 0x64, 0x7e, 0x78, 0xbf, 0xe7, 0x06, 0xca, 0x4c, 0xf5, 0xe9, 0xc5,
|
|
1932
|
+
0x45, 0x3e, 0x9f, 0x7c, 0xfd, 0x2b, 0x8b, 0x4c, 0x8d, 0x16, 0x9a, 0x44, 0xe5, 0x5c,
|
|
1933
|
+
0x88, 0xd4, 0xa9, 0xa7, 0xf9, 0x47, 0x42, 0x41, 0x10, 0x92, 0xab, 0xbd, 0xf8, 0xb8,
|
|
1934
|
+
0x89, 0xe5, 0xc1, 0x99, 0xd0, 0x96, 0xe3, 0xf2, 0x47, 0x88,
|
|
2027
1935
|
];
|
|
2028
1936
|
|
|
2029
|
-
assert_encrypt_initial_pkt(
|
|
2030
|
-
&mut header,
|
|
2031
|
-
&dcid,
|
|
2032
|
-
&frames,
|
|
2033
|
-
2,
|
|
2034
|
-
4,
|
|
2035
|
-
false,
|
|
2036
|
-
&pkt,
|
|
2037
|
-
);
|
|
1937
|
+
assert_encrypt_initial_pkt(&mut header, &dcid, &frames, 2, 4, false, &pkt);
|
|
2038
1938
|
}
|
|
2039
1939
|
|
|
2040
1940
|
#[test]
|
|
2041
1941
|
fn encrypt_server_initial_v1() {
|
|
2042
1942
|
let mut header = [
|
|
2043
|
-
0xc1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50,
|
|
2044
|
-
|
|
1943
|
+
0xc1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62,
|
|
1944
|
+
0xb5, 0x00, 0x40, 0x75, 0x00, 0x01,
|
|
2045
1945
|
];
|
|
2046
1946
|
|
|
2047
1947
|
let dcid = [0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08];
|
|
2048
1948
|
|
|
2049
1949
|
let frames = [
|
|
2050
|
-
0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x40, 0x5a, 0x02, 0x00,
|
|
2051
|
-
|
|
2052
|
-
|
|
2053
|
-
|
|
2054
|
-
|
|
2055
|
-
|
|
2056
|
-
|
|
2057
|
-
|
|
2058
|
-
0xf3, 0x2b, 0xb9, 0xda, 0x1a, 0x00, 0x2b, 0x00, 0x02, 0x03, 0x04,
|
|
1950
|
+
0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x40, 0x5a, 0x02, 0x00, 0x00, 0x56, 0x03,
|
|
1951
|
+
0x03, 0xee, 0xfc, 0xe7, 0xf7, 0xb3, 0x7b, 0xa1, 0xd1, 0x63, 0x2e, 0x96, 0x67, 0x78,
|
|
1952
|
+
0x25, 0xdd, 0xf7, 0x39, 0x88, 0xcf, 0xc7, 0x98, 0x25, 0xdf, 0x56, 0x6d, 0xc5, 0x43,
|
|
1953
|
+
0x0b, 0x9a, 0x04, 0x5a, 0x12, 0x00, 0x13, 0x01, 0x00, 0x00, 0x2e, 0x00, 0x33, 0x00,
|
|
1954
|
+
0x24, 0x00, 0x1d, 0x00, 0x20, 0x9d, 0x3c, 0x94, 0x0d, 0x89, 0x69, 0x0b, 0x84, 0xd0,
|
|
1955
|
+
0x8a, 0x60, 0x99, 0x3c, 0x14, 0x4e, 0xca, 0x68, 0x4d, 0x10, 0x81, 0x28, 0x7c, 0x83,
|
|
1956
|
+
0x4d, 0x53, 0x11, 0xbc, 0xf3, 0x2b, 0xb9, 0xda, 0x1a, 0x00, 0x2b, 0x00, 0x02, 0x03,
|
|
1957
|
+
0x04,
|
|
2059
1958
|
];
|
|
2060
1959
|
|
|
2061
1960
|
let pkt = [
|
|
2062
|
-
0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50,
|
|
2063
|
-
|
|
2064
|
-
|
|
2065
|
-
|
|
2066
|
-
|
|
2067
|
-
|
|
2068
|
-
|
|
2069
|
-
|
|
2070
|
-
|
|
2071
|
-
|
|
2072
|
-
0xaf, 0x2f, 0x58, 0x89, 0x18, 0x50, 0xab, 0xbd, 0xca, 0x3d, 0x20,
|
|
2073
|
-
0x39, 0x8c, 0x27, 0x64, 0x56, 0xcb, 0xc4, 0x21, 0x58, 0x40, 0x7d,
|
|
2074
|
-
0xd0, 0x74, 0xee,
|
|
1961
|
+
0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62,
|
|
1962
|
+
0xb5, 0x00, 0x40, 0x75, 0xc0, 0xd9, 0x5a, 0x48, 0x2c, 0xd0, 0x99, 0x1c, 0xd2, 0x5b,
|
|
1963
|
+
0x0a, 0xac, 0x40, 0x6a, 0x58, 0x16, 0xb6, 0x39, 0x41, 0x00, 0xf3, 0x7a, 0x1c, 0x69,
|
|
1964
|
+
0x79, 0x75, 0x54, 0x78, 0x0b, 0xb3, 0x8c, 0xc5, 0xa9, 0x9f, 0x5e, 0xde, 0x4c, 0xf7,
|
|
1965
|
+
0x3c, 0x3e, 0xc2, 0x49, 0x3a, 0x18, 0x39, 0xb3, 0xdb, 0xcb, 0xa3, 0xf6, 0xea, 0x46,
|
|
1966
|
+
0xc5, 0xb7, 0x68, 0x4d, 0xf3, 0x54, 0x8e, 0x7d, 0xde, 0xb9, 0xc3, 0xbf, 0x9c, 0x73,
|
|
1967
|
+
0xcc, 0x3f, 0x3b, 0xde, 0xd7, 0x4b, 0x56, 0x2b, 0xfb, 0x19, 0xfb, 0x84, 0x02, 0x2f,
|
|
1968
|
+
0x8e, 0xf4, 0xcd, 0xd9, 0x37, 0x95, 0xd7, 0x7d, 0x06, 0xed, 0xbb, 0x7a, 0xaf, 0x2f,
|
|
1969
|
+
0x58, 0x89, 0x18, 0x50, 0xab, 0xbd, 0xca, 0x3d, 0x20, 0x39, 0x8c, 0x27, 0x64, 0x56,
|
|
1970
|
+
0xcb, 0xc4, 0x21, 0x58, 0x40, 0x7d, 0xd0, 0x74, 0xee,
|
|
2075
1971
|
];
|
|
2076
1972
|
|
|
2077
1973
|
assert_encrypt_initial_pkt(&mut header, &dcid, &frames, 1, 2, true, &pkt);
|
|
@@ -2080,16 +1976,16 @@ mod tests {
|
|
|
2080
1976
|
#[test]
|
|
2081
1977
|
fn encrypt_chacha20() {
|
|
2082
1978
|
let secret = [
|
|
2083
|
-
0x9a, 0xc3, 0x12, 0xa7, 0xf8, 0x77, 0x46, 0x8e, 0xbe, 0x69, 0x42,
|
|
2084
|
-
|
|
2085
|
-
|
|
1979
|
+
0x9a, 0xc3, 0x12, 0xa7, 0xf8, 0x77, 0x46, 0x8e, 0xbe, 0x69, 0x42, 0x27, 0x48, 0xad,
|
|
1980
|
+
0x00, 0xa1, 0x54, 0x43, 0xf1, 0x82, 0x03, 0xa0, 0x7d, 0x60, 0x60, 0xf6, 0x88, 0xf3,
|
|
1981
|
+
0x0f, 0x21, 0x63, 0x2b,
|
|
2086
1982
|
];
|
|
2087
1983
|
|
|
2088
1984
|
let mut header = [0x42, 0x00, 0xbf, 0xf4];
|
|
2089
1985
|
|
|
2090
1986
|
let expected_pkt = [
|
|
2091
|
-
0x4c, 0xfe, 0x41, 0x89, 0x65, 0x5e, 0x5c, 0xd5, 0x5c, 0x41, 0xf6,
|
|
2092
|
-
|
|
1987
|
+
0x4c, 0xfe, 0x41, 0x89, 0x65, 0x5e, 0x5c, 0xd5, 0x5c, 0x41, 0xf6, 0x90, 0x80, 0x57,
|
|
1988
|
+
0x5d, 0x79, 0x99, 0xc2, 0x5a, 0x5b, 0xfb,
|
|
2093
1989
|
];
|
|
2094
1990
|
|
|
2095
1991
|
let mut b = octets::OctetsMut::with_slice(&mut header);
|
|
@@ -2155,9 +2051,7 @@ mod tests {
|
|
|
2155
2051
|
|
|
2156
2052
|
let payload_len = b.get_varint().unwrap() as usize;
|
|
2157
2053
|
|
|
2158
|
-
let (aead, _) =
|
|
2159
|
-
crypto::derive_initial_key_material(b"", hdr.version, true, false)
|
|
2160
|
-
.unwrap();
|
|
2054
|
+
let (aead, _) = crypto::derive_initial_key_material(b"", hdr.version, true, false).unwrap();
|
|
2161
2055
|
|
|
2162
2056
|
assert_eq!(
|
|
2163
2057
|
decrypt_pkt(&mut b, 0, 1, payload_len, &aead),
|
|
@@ -2189,9 +2083,7 @@ mod tests {
|
|
|
2189
2083
|
// No space for decryption.
|
|
2190
2084
|
let payload_len = 1;
|
|
2191
2085
|
|
|
2192
|
-
let (aead, _) =
|
|
2193
|
-
crypto::derive_initial_key_material(b"", hdr.version, true, false)
|
|
2194
|
-
.unwrap();
|
|
2086
|
+
let (aead, _) = crypto::derive_initial_key_material(b"", hdr.version, true, false).unwrap();
|
|
2195
2087
|
|
|
2196
2088
|
assert_eq!(
|
|
2197
2089
|
decrypt_pkt(&mut b, 0, 1, payload_len, &aead),
|
|
@@ -2227,11 +2119,7 @@ mod tests {
|
|
|
2227
2119
|
assert!(!skip_manager.should_skip_pn(handshake_completed));
|
|
2228
2120
|
|
|
2229
2121
|
// Arm `skip_pn_counter`
|
|
2230
|
-
skip_manager.on_packet_sent(
|
|
2231
|
-
cwnd,
|
|
2232
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2233
|
-
handshake_completed,
|
|
2234
|
-
);
|
|
2122
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2235
2123
|
assert_eq!(next_pn, 0);
|
|
2236
2124
|
assert!(skip_manager.skip_pn.is_none());
|
|
2237
2125
|
assert!(skip_manager.skip_pn_counter.unwrap() >= MIN_SKIP_COUNTER_VALUE);
|
|
@@ -2242,11 +2130,7 @@ mod tests {
|
|
|
2242
2130
|
// pretend to send the next packet
|
|
2243
2131
|
next_pn += 1;
|
|
2244
2132
|
|
|
2245
|
-
skip_manager.on_packet_sent(
|
|
2246
|
-
cwnd,
|
|
2247
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2248
|
-
handshake_completed,
|
|
2249
|
-
);
|
|
2133
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2250
2134
|
}
|
|
2251
2135
|
assert!(next_pn >= MIN_SKIP_COUNTER_VALUE);
|
|
2252
2136
|
assert!(skip_manager.skip_pn.is_none());
|
|
@@ -2274,21 +2158,13 @@ mod tests {
|
|
|
2274
2158
|
|
|
2275
2159
|
// Don't arm the skip_pn_counter since its still armed (0 means
|
|
2276
2160
|
// expired)
|
|
2277
|
-
skip_manager.on_packet_sent(
|
|
2278
|
-
cwnd,
|
|
2279
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2280
|
-
handshake_completed,
|
|
2281
|
-
);
|
|
2161
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2282
2162
|
assert!(skip_manager.skip_pn.is_some());
|
|
2283
2163
|
assert!(skip_manager.skip_pn_counter.is_none());
|
|
2284
2164
|
|
|
2285
2165
|
// Arm the skip_pn_counter once the skip_pn has been verified
|
|
2286
2166
|
skip_manager.skip_pn = None;
|
|
2287
|
-
skip_manager.on_packet_sent(
|
|
2288
|
-
cwnd,
|
|
2289
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2290
|
-
handshake_completed,
|
|
2291
|
-
);
|
|
2167
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2292
2168
|
assert!(skip_manager.skip_pn.is_none());
|
|
2293
2169
|
assert!(skip_manager.skip_pn_counter.is_some());
|
|
2294
2170
|
}
|
|
@@ -2301,20 +2177,12 @@ mod tests {
|
|
|
2301
2177
|
|
|
2302
2178
|
// Don't arm the skip_pn_counter since handshake is not complete
|
|
2303
2179
|
let mut handshake_completed = false;
|
|
2304
|
-
skip_manager.on_packet_sent(
|
|
2305
|
-
cwnd,
|
|
2306
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2307
|
-
handshake_completed,
|
|
2308
|
-
);
|
|
2180
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2309
2181
|
assert!(skip_manager.skip_pn_counter.is_none());
|
|
2310
2182
|
|
|
2311
2183
|
// Arm counter after handshake complete
|
|
2312
2184
|
handshake_completed = true;
|
|
2313
|
-
skip_manager.on_packet_sent(
|
|
2314
|
-
cwnd,
|
|
2315
|
-
MAX_SEND_UDP_PAYLOAD_SIZE,
|
|
2316
|
-
handshake_completed,
|
|
2317
|
-
);
|
|
2185
|
+
skip_manager.on_packet_sent(cwnd, MAX_SEND_UDP_PAYLOAD_SIZE, handshake_completed);
|
|
2318
2186
|
assert!(skip_manager.skip_pn_counter.is_some());
|
|
2319
2187
|
}
|
|
2320
2188
|
|