mirror of
https://github.com/refraction-networking/utls.git
synced 2025-04-03 20:17:36 +03:00
crypto/tls: support AES-128-CBC cipher suites with SHA-256.
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
parent
5ad0511ca2
commit
e099795efd
34 changed files with 2043 additions and 1717 deletions
86
testdata/Client-TLSv12-RenegotiationRejected
vendored
86
testdata/Client-TLSv12-RenegotiationRejected
vendored
|
|
@ -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 ec 51 a4 79 dd |....Y...U...Q.y.|
|
||||
00000010 3b 69 4a 16 5b 93 ed 46 28 04 ff 5c 85 75 bc f2 |;iJ.[..F(..\.u..|
|
||||
00000020 f5 c1 73 1f a2 21 cf 2e 26 41 8d 20 f7 fb 87 4f |..s..!..&A. ...O|
|
||||
00000030 0b 16 9c a9 ca fb 9a a9 7c eb 7f 92 c1 54 e8 eb |........|....T..|
|
||||
00000040 5b c2 f5 4d 35 48 e9 42 a0 b9 ee be c0 2f 00 00 |[..M5H.B...../..|
|
||||
00000000 16 03 03 00 59 02 00 00 55 03 03 f6 20 3c 21 84 |....Y...U... <!.|
|
||||
00000010 6b 59 08 ad 80 03 17 90 65 e1 6a 69 63 46 4c 89 |kY......e.jicFL.|
|
||||
00000020 ad fb 22 5a f2 88 3e c8 a9 93 87 20 e0 48 ea ef |.."Z..>.... .H..|
|
||||
00000030 e5 ad e4 59 00 31 39 25 e7 fd 3e 2f a2 2a 32 11 |...Y.19%..>/.*2.|
|
||||
00000040 2a ad 83 35 ea f8 e5 05 87 54 33 d2 c0 2f 00 00 |*..5.....T3../..|
|
||||
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 fc eb 26 2a 1f 0d |........A...&*..|
|
||||
000002d0 64 f0 4f 23 b3 82 ce 78 14 76 72 b2 45 c0 b0 d7 |d.O#...x.vr.E...|
|
||||
000002e0 36 dd 9c c4 bf b4 4b 40 69 ad d6 84 76 2b 8f d1 |6.....K@i...v+..|
|
||||
000002f0 d1 8d 4f 67 40 96 91 88 9c b0 20 46 0a e2 6e 62 |..Og@..... F..nb|
|
||||
00000300 8d 83 d4 8e 38 d4 b9 d1 aa e0 04 01 00 80 05 c6 |....8...........|
|
||||
00000310 e8 95 17 54 3e ee 0f 88 90 69 d8 d0 6f c4 f5 f0 |...T>....i..o...|
|
||||
00000320 8c 5d 73 6a 9d 53 83 1b 63 ae 96 70 ce d6 3e 04 |.]sj.S..c..p..>.|
|
||||
00000330 7d f6 4f 95 89 be 66 1c 3a e6 e0 79 45 b4 55 24 |}.O...f.:..yE.U$|
|
||||
00000340 d0 a7 a1 18 4b d5 b7 b6 39 93 7c bf b6 37 d9 44 |....K...9.|..7.D|
|
||||
00000350 ec 1a 0c b8 70 c5 7b ac a4 b8 7b 3e b0 45 00 27 |....p.{...{>.E.'|
|
||||
00000360 8a 12 f1 e8 fe 07 ac 91 61 6b df 0c 36 19 ab 71 |........ak..6..q|
|
||||
00000370 b6 9f db 61 b9 c4 04 10 37 81 ef 74 e5 94 fb 89 |...a....7..t....|
|
||||
00000380 95 a4 44 84 5d d0 eb 3d 37 54 1e 63 da cb 16 03 |..D.]..=7T.c....|
|
||||
000002c0 cd 0c 00 00 c9 03 00 17 41 04 f3 61 70 23 72 6b |........A..ap#rk|
|
||||
000002d0 0c 87 56 6d f0 0c e8 e8 8e 3c cb ad 1e 41 41 3b |..Vm.....<...AA;|
|
||||
000002e0 ac 17 af 69 01 59 50 64 4b e1 55 11 89 0c 45 4d |...i.YPdK.U...EM|
|
||||
000002f0 cb 2a 1f 8a 01 ef f4 cf 82 1c af ab a3 d9 ef 65 |.*.............e|
|
||||
00000300 30 08 d2 cd bc ad 1f 66 00 8e 04 01 00 80 0c 44 |0......f.......D|
|
||||
00000310 fa 5e 0a 5d f3 e6 9f d2 08 4e dd f5 02 22 37 1e |.^.].....N..."7.|
|
||||
00000320 10 d5 fb 80 15 25 0a f1 c5 1f 97 66 fc 3e fb cd |.....%.....f.>..|
|
||||
00000330 bb 0e 4d 63 e7 70 ad 1a 95 b6 9b e0 c5 15 c8 64 |..Mc.p.........d|
|
||||
00000340 6c c5 e1 ce f2 8a bf 01 33 41 31 1b e4 8e 4a d4 |l.......3A1...J.|
|
||||
00000350 82 73 4c c3 3a 16 15 27 55 1c 24 3f e6 b2 43 87 |.sL.:..'U.$?..C.|
|
||||
00000360 d4 3e bb 4d ac 8a bf bb ee d5 0f 06 ac 3f c3 bc |.>.M.........?..|
|
||||
00000370 2a 14 b9 80 f8 0d ff 7a ae 91 08 69 17 e6 ee 2c |*......z...i...,|
|
||||
00000380 f5 d8 80 b5 8a 70 da e4 b5 0d 3d 51 55 1a 16 03 |.....p....=QU...|
|
||||
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..|
|
||||
|
|
@ -73,24 +73,24 @@
|
|||
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 03 00 01 |..h.A.Vk.Z......|
|
||||
00000050 01 16 03 03 00 28 00 00 00 00 00 00 00 00 52 89 |.....(........R.|
|
||||
00000060 96 4a 6a 3a 06 d7 39 7c cf 9b 98 94 5a 9c 24 61 |.Jj:..9|....Z.$a|
|
||||
00000070 c4 a7 a6 2c bf a1 58 2c 7b ae a7 42 3f 75 |...,..X,{..B?u|
|
||||
00000050 01 16 03 03 00 28 00 00 00 00 00 00 00 00 82 21 |.....(.........!|
|
||||
00000060 0f 0a 3c 57 97 77 80 ad c5 a0 d9 c8 55 83 75 1b |..<W.w......U.u.|
|
||||
00000070 7b 66 54 8f 74 77 dc 12 22 32 ba 94 f3 66 |{fT.tw.."2...f|
|
||||
>>> Flow 4 (server to client)
|
||||
00000000 14 03 03 00 01 01 16 03 03 00 28 92 8c 2a 95 70 |..........(..*.p|
|
||||
00000010 1c e9 5c 9a e3 38 40 36 06 2c 90 8b 60 71 fd 79 |..\..8@6.,..`q.y|
|
||||
00000020 11 3a 5a 6a 2d 48 a1 25 48 26 62 b3 b9 5e 20 2a |.:Zj-H.%H&b..^ *|
|
||||
00000030 96 e4 36 |..6|
|
||||
00000000 14 03 03 00 01 01 16 03 03 00 28 9b b2 6a 5a 2e |..........(..jZ.|
|
||||
00000010 76 9a f9 42 0b cb 16 30 8e 45 d6 61 e9 05 57 18 |v..B...0.E.a..W.|
|
||||
00000020 65 4d a8 ca 20 8a 1d 37 00 b1 e3 eb eb 66 20 dc |eM.. ..7.....f .|
|
||||
00000030 3e ad 37 |>.7|
|
||||
>>> Flow 5 (client to server)
|
||||
00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 ec 70 62 |..............pb|
|
||||
00000010 95 4c 48 dd e3 75 e7 05 bb 0a e0 cf d9 2e dd a0 |.LH..u..........|
|
||||
00000020 75 43 dd |uC.|
|
||||
00000000 17 03 03 00 1e 00 00 00 00 00 00 00 01 7a f6 16 |.............z..|
|
||||
00000010 3f 4d 4d f0 ce 77 91 77 ae 05 3c 6e 6d e3 7b 0c |?MM..w.w..<nm.{.|
|
||||
00000020 5b 1e 82 |[..|
|
||||
>>> Flow 6 (server to client)
|
||||
00000000 16 03 03 00 1c 92 8c 2a 95 70 1c e9 5d f8 42 e3 |.......*.p..].B.|
|
||||
00000010 56 2d da 6a e6 65 bd d8 48 d7 60 80 67 9b 78 df |V-.j.e..H.`.g.x.|
|
||||
00000020 40 |@|
|
||||
00000000 16 03 03 00 1c 9b b2 6a 5a 2e 76 9a fa ec 9f e5 |.......jZ.v.....|
|
||||
00000010 8a 90 6b 44 14 61 98 1f 31 ee 5c f3 ee c3 1c 74 |..kD.a..1.\....t|
|
||||
00000020 d4 |.|
|
||||
>>> Flow 7 (client to server)
|
||||
00000000 15 03 03 00 1a 00 00 00 00 00 00 00 02 b5 10 47 |...............G|
|
||||
00000010 3e c1 98 c1 ad e1 05 83 ca 46 83 91 1e 4b d1 15 |>........F...K..|
|
||||
00000020 03 03 00 1a 00 00 00 00 00 00 00 03 bb a7 ca fd |................|
|
||||
00000030 d6 be d3 2e 30 7c d9 d7 8a d9 83 78 90 a3 |....0|.....x..|
|
||||
00000000 15 03 03 00 1a 00 00 00 00 00 00 00 02 ca e0 98 |................|
|
||||
00000010 02 b2 04 3d e9 e2 b1 e8 c5 a0 c6 92 e7 7a f0 15 |...=.........z..|
|
||||
00000020 03 03 00 1a 00 00 00 00 00 00 00 03 7a 34 47 57 |............z4GW|
|
||||
00000030 3f 3f d6 41 7a 98 ef 84 a8 18 9a f4 e7 9d |??.Az.........|
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue