mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: support AES-128-CBC cipher suites with SHA-256.

Browse source 
These were new with TLS 1.2 and, reportedly, some servers require it.
Since it's easy, this change adds suport for three flavours of
AES-128-CBC with SHA-256 MACs.

Other testdata/ files have to be updated because this changes the list
of cipher suites offered by default by the client.

Fixes #15487.

Change-Id: I1b14330c31eeda20185409a37072343552c3464f
Reviewed-on: https://go-review.googlesource.com/27315
Run-TryBot: Adam Langley <agl@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Jonathan Rudenberg <jonathan@titanous.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Adam Langley 2016-08-17 16:45:47 -07:00
parent 5ad0511ca2
commit e099795efd
34 changed files with 2043 additions and 1717 deletions
Download patch file Download diff file Expand all files Collapse all files

82
testdata/Client-TLSv10-ECDHE-RSA-AES vendored
View file

@ -1,19 +1,19 @@
>>> Flow 1 (client to server)
00000000 16 03 01 00 85 01 00 00 81 03 03 00 00 00 00 00 |................|
00000000 16 03 01 00 8b 01 00 00 87 03 03 00 00 00 00 00 |................|
00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
00000020 00 00 00 00 00 00 00 00 00 00 00 00 00 22 c0 2f |............."./|
00000030 c0 2b c0 30 c0 2c c0 11 c0 07 c0 13 c0 09 c0 14 |.+.0.,..........|
00000040 c0 0a 00 9c 00 9d 00 05 00 2f 00 35 c0 12 00 0a |........./.5....|
00000050 01 00 00 36 00 05 00 05 01 00 00 00 00 00 0a 00 |...6............|
00000060 08 00 06 00 17 00 18 00 19 00 0b 00 02 01 00 00 |................|
00000070 0d 00 0e 00 0c 04 01 04 03 05 01 05 03 02 01 02 |................|
00000080 03 ff 01 00 01 00 00 12 00 00 |..........|
00000020 00 00 00 00 00 00 00 00 00 00 00 00 00 28 c0 2f |.............(./|
00000030 c0 2b c0 30 c0 2c c0 27 c0 13 c0 23 c0 09 c0 14 |.+.0.,.'...#....|
00000040 c0 0a 00 9c 00 9d 00 3c 00 2f 00 35 c0 12 00 0a |.......<./.5....|
00000050 00 05 c0 11 c0 07 01 00 00 36 00 05 00 05 01 00 |.........6......|
00000060 00 00 00 00 0a 00 08 00 06 00 17 00 18 00 19 00 |................|
00000070 0b 00 02 01 00 00 0d 00 0e 00 0c 04 01 04 03 05 |................|
00000080 01 05 03 02 01 02 03 ff 01 00 01 00 00 12 00 00 |................|
>>> Flow 2 (server to client)
00000000 16 03 01 00 59 02 00 00 55 03 01 51 b8 cd 30 d0 |....Y...U..Q..0.|
00000010 7b eb f1 0e 3e 17 0c 43 84 a0 3e 1d d8 b2 88 41 |{...>..C..>....A|
00000020 6d 16 bf d7 de 8b 3d 51 4a 74 dd 20 6e 3a 62 a0 |m.....=QJt. n:b.|
00000030 1e f2 11 c0 aa bd 9b 5f 0d 2a 73 1f 51 84 d0 00 |......._.*s.Q...|
00000040 51 eb 3c 04 ae 05 cd 49 b6 41 92 37 c0 13 00 00 |Q.<....I.A.7....|
00000000 16 03 01 00 59 02 00 00 55 03 01 72 0c 3b 9c 77 |....Y...U..r.;.w|
00000010 8a 2b 1c 13 28 ad 08 30 aa ca 23 dc 54 7b 48 c7 |.+..(..0..#.T{H.|
00000020 2e c2 81 23 6c 35 c9 a9 3f 42 ef 20 dd 0c 72 42 |...#l5..?B. ..rB|
00000030 8f 8e d0 1a ed 47 ed 6f 94 68 a5 bc 47 42 2a ee |.....G.o.h..GB*.|
00000040 3b 3d 61 6a bd 88 3e 6e e5 54 a3 cd c0 13 00 00 |;=aj..>n.T......|
00000050 0d ff 01 00 01 00 00 0b 00 04 03 00 01 02 16 03 |................|
00000060 01 02 59 0b 00 02 55 00 02 52 00 02 4f 30 82 02 |..Y...U..R..O0..|
00000070 4b 30 82 01 b4 a0 03 02 01 02 02 09 00 e8 f0 9d |K0..............|
@ -53,19 +53,19 @@
00000290 77 8d 0c 1c f1 0f a1 d8 40 83 61 c9 4c 72 2b 9d |w.......@.a.Lr+.|
000002a0 ae db 46 06 06 4d f4 c1 b3 3e c0 d1 bd 42 d4 db |..F..M...>...B..|
000002b0 fe 3d 13 60 84 5c 21 d3 3b e9 fa e7 16 03 01 00 |.=.`.\!.;.......|
000002c0 cb 0c 00 00 c7 03 00 17 41 04 e6 ec 64 a9 ca 4a |........A...d..J|
000002d0 83 65 26 18 62 f2 54 a6 45 4b 9c 55 b4 3c 32 66 |.e&.b.T.EK.U.<2f|
000002e0 43 da d8 2e 4e e5 8e 88 fc 30 1b 2f 26 23 96 d8 |C...N....0./&#..|
000002f0 c5 3d 5f 79 dd 82 6e de 9e 9f 2c 1c 4a 91 bc 22 |.=_y..n...,.J.."|
00000300 09 39 3b 6a 4a b9 53 d2 4d 21 00 80 9e 0e 8b 9d |.9;jJ.S.M!......|
00000310 2f 00 0c 4e 28 27 31 51 d6 8a 25 04 3d 5a e6 be |/..N('1Q..%.=Z..|
00000320 6f 45 6d f0 ec 5b 42 5d f2 e1 22 38 d8 a6 b9 88 |oEm..[B].."8....|
00000330 6f 09 5a 44 45 50 3c 88 83 0c ba 38 dd 0a e1 e7 |o.ZDEP<....8....|
00000340 b7 ae 8c 75 6a b7 8d ee 04 a2 16 f9 52 50 a1 21 |...uj.......RP.!|
00000350 c6 74 c2 79 1c b1 be 15 51 f0 0a 37 d7 5a c0 4f |.t.y....Q..7.Z.O|
00000360 16 dd 19 0b dd ee 18 f9 76 27 b2 00 f7 29 9d 23 |........v'...).#|
00000370 7f 1a 25 4a 75 8d bb 11 1c c2 35 66 76 df b5 a0 |..%Ju.....5fv...|
00000380 c0 4e 73 c9 fa b0 07 ee 2f 3f 3d d1 16 03 01 00 |.Ns...../?=.....|
000002c0 cb 0c 00 00 c7 03 00 17 41 04 82 a5 dc 05 3f fb |........A.....?.|
000002d0 cb 6b d0 7f 6d 01 f9 be df 3a a6 2e 52 fc 82 5d |.k..m....:..R..]|
000002e0 8a ab 45 bd 94 f8 04 da 2e 4b e1 33 06 11 8c c1 |..E......K.3....|
000002f0 2f 35 94 7b ef 4e 05 cb 5f 7c 27 16 72 2c bb 96 |/5.{.N.._|'.r,..|
00000300 3e 81 d3 01 f0 5e 8e 95 4a db 00 80 41 13 7a 1b |>....^..J...A.z.|
00000310 4d 4c ed ff ea 59 80 39 6f f9 72 33 23 32 17 42 |ML...Y.9o.r3#2.B|
00000320 3d 78 80 c2 f6 02 f6 71 0c dc 1b 86 c7 11 9f 4e |=x.....q.......N|
00000330 f3 f9 e3 ab fa 6f a9 78 35 79 25 41 9f e3 57 42 |.....o.x5y%A..WB|
00000340 83 c0 60 f8 d0 83 05 8d b2 34 33 d5 7d 3a e3 a4 |..`......43.}:..|
00000350 09 8b 49 dc 17 74 dd 5e 67 c9 10 ee c0 ba 89 b2 |..I..t.^g.......|
00000360 91 2f a2 de 1b 39 9c 2c c9 10 13 43 f1 e8 69 98 |./...9.,...C..i.|
00000370 19 75 02 ee dc fb 85 28 cb bf 00 1e 50 bb 42 f9 |.u.....(....P.B.|
00000380 f0 81 28 4a 9e c8 a1 aa 29 55 d8 34 16 03 01 00 |..(J....)U.4....|
00000390 04 0e 00 00 00 |.....|
>>> Flow 3 (client to server)
00000000 16 03 01 00 46 10 00 00 42 41 04 1e 18 37 ef 0d |....F...BA...7..|
@ -73,20 +73,20 @@
00000020 a7 24 20 3e b2 56 1c ce 97 28 5e f8 2b 2d 4f 9e |.$ >.V...(^.+-O.|
00000030 f1 07 9f 6c 4b 5b 83 56 e2 32 42 e9 58 b6 d7 49 |...lK[.V.2B.X..I|
00000040 a6 b5 68 1a 41 03 56 6b dc 5a 89 14 03 01 00 01 |..h.A.Vk.Z......|
00000050 01 16 03 01 00 30 37 ae 52 9b 23 a0 11 58 75 a2 |.....07.R.#..Xu.|
00000060 49 5d bb 00 0d ea 1f ec 1b 56 77 b5 5a ab 01 34 |I].......Vw.Z..4|
00000070 d5 f6 0c 77 69 90 dc f5 fc 90 d9 80 1b 7c 8c d4 |...wi........|..|
00000080 22 bb 26 a6 22 f2 |".&.".|
00000050 01 16 03 01 00 30 05 a0 da 78 00 e3 2f f7 76 45 |.....0...x../.vE|
00000060 7d 37 48 65 01 63 27 76 4a 7f fe cd 2b 4b d6 49 |}7He.c'vJ...+K.I|
00000070 93 79 e6 b1 23 a5 c6 ea db 1f af be 6a 16 55 9f |.y..#.......j.U.|
00000080 3d 06 1f 4d 88 7a |=..M.z|
>>> Flow 4 (server to client)
00000000 14 03 01 00 01 01 16 03 01 00 30 6a 8b c9 64 6f |..........0j..do|
00000010 41 bf 2d 65 b4 a5 7e 44 d2 39 38 e8 23 8f 39 e1 |A.-e..~D.98.#.9.|
00000020 11 67 e8 93 e6 30 0f 49 d2 8d 40 c5 7a 7c 6c 0e |.g...0.I..@.z|l.|
00000030 d1 b8 eb 51 1d 56 a5 81 ad 59 d7 |...Q.V...Y.|
00000000 14 03 01 00 01 01 16 03 01 00 30 90 65 20 ff da |..........0.e ..|
00000010 ee fa 89 8b 75 09 e7 d8 90 a5 0f 12 16 0f 12 40 |....u..........@|
00000020 34 78 ee 50 c4 f8 31 c6 55 5e ac 21 42 b8 aa a8 |4x.P..1.U^.!B...|
00000030 d8 36 a9 f0 ab 7d e8 22 99 e1 3c |.6...}."..<|
>>> Flow 5 (client to server)
00000000 17 03 01 00 20 f0 8a 52 33 bc 36 2d c8 51 9f a3 |.... ..R3.6-.Q..|
00000010 55 0a 83 c2 d3 53 28 8f 77 60 4d 84 b7 cb e2 e2 |U....S(.w`M.....|
00000020 93 27 88 0a f3 17 03 01 00 20 8f 20 61 89 96 cb |.'....... . a...|
00000030 13 4e d8 84 dc 2e b4 75 23 a6 25 e2 98 ef aa c5 |.N.....u#.%.....|
00000040 cc 3f 45 e9 3c 2d 37 44 c6 ad 15 03 01 00 20 1f |.?E.<-7D...... .|
00000050 70 88 da 4d a2 52 2b 02 8e a4 8a 4d f8 51 59 d4 |p..M.R+....M.QY.|
00000060 5f a6 a6 83 e8 77 1c 82 4d 95 9c 40 87 e3 d3 |_....w..M..@...|
00000000 17 03 01 00 20 67 4c 09 40 a9 00 c3 b0 2c dd e6 |.... gL.@....,..|
00000010 7e 95 5d dc 22 ac 53 79 81 51 07 e4 20 41 79 16 |~.].".Sy.Q.. Ay.|
00000020 e0 98 94 70 2b 17 03 01 00 20 68 7a 08 85 27 fa |...p+.... hz..'.|
00000030 7e ad 02 c3 83 26 42 52 36 59 1d f9 af 79 7f 24 |~....&BR6Y...y.$|
00000040 c8 72 af dd f2 ec f6 16 0d 79 15 03 01 00 20 c6 |.r.......y.... .|
00000050 ea 99 71 91 df 33 2f dc 17 1e 33 af 76 a5 c5 95 |..q..3/...3.v...|
00000060 20 55 64 c4 13 71 ab 35 84 f9 44 9b f2 a5 d4 | Ud..q.5..D....|