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-TLSv12-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 03 00 59 02 00 00 55 03 03 60 e0 ff c6 9b |....Y...U..`....|
00000010 6c 9a 9d 83 7c 4c 55 a9 58 71 45 13 4d 71 1a d2 |l...|LU.XqE.Mq..|
00000020 4c eb b6 5f 8c aa 3a e2 27 fb 85 20 79 9f 4c 81 |L.._..:.'.. y.L.|
00000030 6e 81 ec 38 85 ab 69 88 95 e9 44 63 6f 23 e4 85 |n..8..i...Dco#..|
00000040 ef d2 85 63 6c df 03 06 e7 bb 95 13 c0 13 00 00 |...cl...........|
00000000 16 03 03 00 59 02 00 00 55 03 03 0f 45 26 1e c1 |....Y...U...E&..|
00000010 a8 81 43 80 a6 3b b8 78 8f 19 83 ca 10 62 90 55 |..C..;.x.....b.U|
00000020 13 5b c3 78 55 23 32 ca 46 ab 1b 20 12 b9 b5 8b |.[.xU#2.F.. ....|
00000030 6a 21 25 9b e6 fc 12 78 0c 62 9f fe 2a dc cd 31 |j!%....x.b..*..1|
00000040 53 a1 6e 3c 79 df 71 12 fd 83 4b 67 c0 13 00 00 |S.n<y.q...Kg....|
00000050 0d ff 01 00 01 00 00 0b 00 04 03 00 01 02 16 03 |................|
00000060 03 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 03 00 |.=.`.\!.;.......|
000002c0 cd 0c 00 00 c9 03 00 17 41 04 d5 40 82 ca e0 2a |........A..@...*|
000002d0 85 38 a6 3c d4 47 0a 86 d1 82 7a 32 b1 dc b3 c9 |.8.<.G....z2....|
000002e0 c6 14 03 64 e2 71 ef 2a 0b 3e ff b6 24 65 a4 5d |...d.q.*.>..$e.]|
000002f0 40 0a 96 7c 75 15 47 ed aa 7a e0 f4 3b 72 00 ed |@..|u.G..z..;r..|
00000300 f1 d9 60 12 9e dc 4e 28 b3 a8 04 01 00 80 0f e6 |..`...N(........|
00000310 ce f4 69 49 e5 4f 7b 43 82 c6 4a 69 ea 57 fb b3 |..iI.O{C..Ji.W..|
00000320 d0 ba ed 82 70 95 64 60 39 c7 77 45 e2 51 18 db |....p.d`9.wE.Q..|
00000330 6a c2 66 34 3a 39 44 52 b7 54 c8 4f e2 3b b2 71 |j.f4:9DR.T.O.;.q|
00000340 ac b7 f5 7c cd d7 a7 3c 0a 6c 04 43 26 c8 75 22 |...|...<.l.C&.u"|
00000350 a4 f3 20 10 ab 4c ff 59 43 79 98 f3 b8 05 ec a8 |.. ..L.YCy......|
00000360 c7 63 90 71 c3 d7 d1 ad 43 b9 77 68 67 63 1f 9c |.c.q....C.whgc..|
00000370 da 6e b4 74 f9 c8 a4 21 c6 46 ba ab d6 a6 29 ea |.n.t...!.F....).|
00000380 c4 73 68 af 18 83 cf e0 d7 37 f0 2c c6 e7 16 03 |.sh......7.,....|
000002c0 cd 0c 00 00 c9 03 00 17 41 04 7b be a6 f9 bd 67 |........A.{....g|
000002d0 6f 05 21 b5 8e 20 e5 35 a7 51 f0 ce c0 76 21 78 |o.!.. .5.Q...v!x|
000002e0 36 d2 39 ca 46 44 0a e0 e5 2a df 59 1e c4 8f c1 |6.9.FD...*.Y....|
000002f0 fc 4a 65 ff e6 18 dc 60 47 6c 31 b0 68 65 02 92 |.Je....`Gl1.he..|
00000300 75 ab 7c db 83 d6 d4 44 06 36 04 01 00 80 40 dd |u.|....D.6....@.|
00000310 9b dd 37 cb 16 bb c7 29 52 3a 02 64 6c a3 c4 06 |..7....)R:.dl...|
00000320 fd 24 e1 d3 b3 83 6c 45 2c 76 17 ae f6 b4 af e7 |.$....lE,v......|
00000330 b7 93 a6 69 e6 8c c8 6b a0 9a 72 9c 80 4e 04 e6 |...i...k..r..N..|
00000340 dd 7e 49 d4 d2 29 9e 2f 64 89 be 00 36 e9 8e 53 |.~I..)./d...6..S|
00000350 0a 23 b2 b6 a1 6e 94 df e1 b2 c1 35 17 85 7c 7a |.#...n.....5..|z|
00000360 5e d1 0f 03 b2 55 2f 52 48 af 66 17 ae 25 3d 0a |^....U/RH.f..%=.|
00000370 dc c7 c2 8e 40 b9 a2 5d 65 25 85 1c 88 d4 6c aa |....@..]e%....l.|
00000380 0b 5b c8 77 4c bd 88 60 eb f2 fc 9f 71 39 16 03 |.[.wL..`....q9..|
00000390 03 00 04 0e 00 00 00 |.......|
>>> Flow 3 (client to server)
00000000 16 03 03 00 46 10 00 00 42 41 04 1e 18 37 ef 0d |....F...BA...7..|
@ -74,21 +74,21 @@
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 03 00 01 |..h.A.Vk.Z......|
00000050 01 16 03 03 00 40 00 00 00 00 00 00 00 00 00 00 |.....@..........|
00000060 00 00 00 00 00 00 0c 32 5c 4c 59 51 c2 48 39 b9 |.......2\LYQ.H9.|
00000070 29 a9 72 fb e4 42 a1 55 08 a3 99 a2 06 ef 59 b7 |).r..B.U......Y.|
00000080 41 d0 b3 e8 ea c2 5f fc 96 54 d5 a6 cf bc 1f 8e |A....._..T......|
00000090 a9 e1 84 ae 8c af |......|
00000060 00 00 00 00 00 00 d1 bb 84 d1 bb 91 17 18 dc 9f |................|
00000070 0a 6f df 19 6f cb 04 c4 0d 4a d1 d1 6c 0d 94 da |.o..o....J..l...|
00000080 54 7a 4d 21 52 99 00 8e 70 6b 15 1f 51 29 8f b6 |TzM!R...pk..Q)..|
00000090 14 ed 8e 53 ea f3 |...S..|
>>> Flow 4 (server to client)
00000000 14 03 03 00 01 01 16 03 03 00 40 79 cb ff 21 66 |..........@y..!f|
00000010 17 d5 5e 5f 80 ef 2a 13 91 30 12 ec f1 37 c9 e3 |..^_..*..0...7..|
00000020 f8 43 6a 36 b8 7a 08 da 46 c8 60 f7 0f 63 fa 43 |.Cj6.z..F.`..c.C|
00000030 99 4e cb 8e bf 2c d8 de 16 b7 98 7e 12 78 e7 a0 |.N...,.....~.x..|
00000040 29 51 34 93 9e bb 0c 2a fb 1d ad |)Q4....*...|
00000000 14 03 03 00 01 01 16 03 03 00 40 9c 15 03 96 11 |..........@.....|
00000010 67 f8 cd 1e 60 b5 a4 12 d1 8e f1 85 63 bf 1d 9d |g...`.......c...|
00000020 3f 93 81 e3 bb 77 75 f3 18 01 d0 c6 c6 35 2b e0 |?....wu......5+.|
00000030 82 03 0f a1 eb 98 09 52 5e b6 53 b5 54 d9 08 67 |.......R^.S.T..g|
00000040 a7 cf bf f3 54 cf f1 26 4f 6e 5b |....T..&On[|
>>> Flow 5 (client to server)
00000000 17 03 03 00 30 00 00 00 00 00 00 00 00 00 00 00 |....0...........|
00000010 00 00 00 00 00 7e 36 1c bc fd 37 60 bd ec 7a a8 |.....~6...7`..z.|
00000020 2e ff f7 1e a9 d9 1b 7c 42 35 d1 56 8a 6f 04 d8 |.......|B5.V.o..|
00000030 1d 05 f7 2b d5 15 03 03 00 30 00 00 00 00 00 00 |...+.....0......|
00000040 00 00 00 00 00 00 00 00 00 00 33 0c 03 55 99 f2 |..........3..U..|
00000050 10 1a 91 74 ea c1 3c 4e ee 58 f7 da 05 fa 15 44 |...t..<N.X.....D|
00000060 81 8b 1a f6 63 b7 6f 9f 12 3b |....c.o..;|
00000010 00 00 00 00 00 65 00 0c 8a 77 a2 48 d1 40 82 9f |.....e...w.H.@..|
00000020 f6 34 89 bf bb 42 d1 ea 6b 7f 61 8e 7b 9b f9 b5 |.4...B..k.a.{...|
00000030 0b a5 d9 8c 0d 15 03 03 00 30 00 00 00 00 00 00 |.........0......|
00000040 00 00 00 00 00 00 00 00 00 00 e5 5f 74 3d bd c6 |..........._t=..|
00000050 5d 68 04 b2 4f 44 0d 43 6b a8 7a 38 81 23 27 10 |]h..OD.Ck.z8.#'.|
00000060 3b 39 63 4c c7 8f 11 21 2e 86 |;9cL...!..|