diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-18 21:00:23 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-18 21:00:23 +0100 |
| commit | a9e186680668056e2c35ce5a99769a7ff0df44cd (patch) | |
| tree | 6e6b529ffd182e6489eeebed6e68662462f40835 /networking | |
| parent | b5dfc3dfd69ec20358827f8ecb2a42ca4b290f03 (diff) | |
| download | busybox-w32-a9e186680668056e2c35ce5a99769a7ff0df44cd.tar.gz busybox-w32-a9e186680668056e2c35ce5a99769a7ff0df44cd.tar.bz2 busybox-w32-a9e186680668056e2c35ce5a99769a7ff0df44cd.zip | |
tls: trim comments
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/tls.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/networking/tls.c b/networking/tls.c index 2b1e36110..6928582df 100644 --- a/networking/tls.c +++ b/networking/tls.c | |||
| @@ -494,16 +494,11 @@ static void tls_error_die(tls_state_t *tls) | |||
| 494 | // Key IV Block | 494 | // Key IV Block |
| 495 | // Cipher Type Material Size Size | 495 | // Cipher Type Material Size Size |
| 496 | // ------------ ------ -------- ---- ----- | 496 | // ------------ ------ -------- ---- ----- |
| 497 | // NULL Stream 0 0 N/A | ||
| 498 | // RC4_128 Stream 16 0 N/A | ||
| 499 | // 3DES_EDE_CBC Block 24 8 8 | ||
| 500 | // AES_128_CBC Block 16 16 16 | 497 | // AES_128_CBC Block 16 16 16 |
| 501 | // AES_256_CBC Block 32 16 16 | 498 | // AES_256_CBC Block 32 16 16 |
| 502 | // | 499 | // |
| 503 | // MAC Algorithm mac_length mac_key_length | 500 | // MAC Algorithm mac_length mac_key_length |
| 504 | // -------- ----------- ---------- -------------- | 501 | // -------- ----------- ---------- -------------- |
| 505 | // NULL N/A 0 0 | ||
| 506 | // MD5 HMAC-MD5 16 16 | ||
| 507 | // SHA HMAC-SHA1 20 20 | 502 | // SHA HMAC-SHA1 20 20 |
| 508 | // SHA256 HMAC-SHA256 32 32 | 503 | // SHA256 HMAC-SHA256 32 32 |
| 509 | static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size) | 504 | static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size) |
| @@ -576,9 +571,6 @@ static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size | |||
| 576 | // Key IV Block | 571 | // Key IV Block |
| 577 | // Cipher Type Material Size Size | 572 | // Cipher Type Material Size Size |
| 578 | // ------------ ------ -------- ---- ----- | 573 | // ------------ ------ -------- ---- ----- |
| 579 | // NULL Stream 0 0 N/A | ||
| 580 | // RC4_128 Stream 16 0 N/A | ||
| 581 | // 3DES_EDE_CBC Block 24 8 8 | ||
| 582 | // AES_128_CBC Block 16 16 16 | 574 | // AES_128_CBC Block 16 16 16 |
| 583 | // AES_256_CBC Block 32 16 16 | 575 | // AES_256_CBC Block 32 16 16 |
| 584 | { | 576 | { |
| @@ -595,8 +587,8 @@ static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size | |||
| 595 | p = mempcpy(p, mac_hash, sizeof(mac_hash)); /* MAC */ | 587 | p = mempcpy(p, mac_hash, sizeof(mac_hash)); /* MAC */ |
| 596 | size += sizeof(mac_hash); | 588 | size += sizeof(mac_hash); |
| 597 | // RFC is talking nonsense: | 589 | // RFC is talking nonsense: |
| 598 | // Padding that is added to force the length of the plaintext to be | 590 | // Padding that is added to force the length of the plaintext to be |
| 599 | // an integral multiple of the block cipher's block length. | 591 | // an integral multiple of the block cipher's block length. |
| 600 | // WRONG. _padding+padding_length_, not just _padding_, | 592 | // WRONG. _padding+padding_length_, not just _padding_, |
| 601 | // pads the data. | 593 | // pads the data. |
| 602 | // IOW: padding_length is the last byte of padding[] array, | 594 | // IOW: padding_length is the last byte of padding[] array, |
| @@ -1166,17 +1158,6 @@ static void send_client_key_exchange(tls_state_t *tls) | |||
| 1166 | // server_write_key[SecurityParameters.enc_key_length] | 1158 | // server_write_key[SecurityParameters.enc_key_length] |
| 1167 | // client_write_IV[SecurityParameters.fixed_iv_length] | 1159 | // client_write_IV[SecurityParameters.fixed_iv_length] |
| 1168 | // server_write_IV[SecurityParameters.fixed_iv_length] | 1160 | // server_write_IV[SecurityParameters.fixed_iv_length] |
| 1169 | |||
| 1170 | |||
| 1171 | // Key IV Block | ||
| 1172 | // Cipher Type Material Size Size | ||
| 1173 | // ------------ ------ -------- ---- ----- | ||
| 1174 | // NULL Stream 0 0 N/A | ||
| 1175 | // RC4_128 Stream 16 0 N/A | ||
| 1176 | // 3DES_EDE_CBC Block 24 8 8 | ||
| 1177 | // AES_128_CBC Block 16 16 16 | ||
| 1178 | // AES_256_CBC Block 32 16 16 | ||
| 1179 | |||
| 1180 | { | 1161 | { |
| 1181 | uint8_t tmp64[64]; | 1162 | uint8_t tmp64[64]; |
| 1182 | 1163 | ||