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:
parent
5ad0511ca2
commit
e099795efd
34 changed files with 2043 additions and 1717 deletions
64
testdata/Client-TLSv10-ClientCert-ECDSA-RSA
vendored
64
testdata/Client-TLSv10-ClientCert-ECDSA-RSA
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 01 00 51 02 00 00 4d 03 01 fc 37 e3 71 ee |....Q...M...7.q.|
|
||||
00000010 db 12 3b 29 8e fa f5 54 fd ef 79 9e dd 36 17 0e |..;)...T..y..6..|
|
||||
00000020 c2 f4 3a 0d 16 82 15 29 12 dd 5b 20 f1 47 9e d2 |..:....)..[ .G..|
|
||||
00000030 58 db 81 04 97 55 2e 4d d1 e7 25 9f 2e 78 48 b7 |X....U.M..%..xH.|
|
||||
00000040 4e 29 ad 4a af a9 24 3e 34 0b 18 01 00 05 00 00 |N).J..$>4.......|
|
||||
00000000 16 03 01 00 51 02 00 00 4d 03 01 7b 56 22 f2 0d |....Q...M..{V"..|
|
||||
00000010 53 16 b1 66 83 aa 0c 7c 4b ef 8f e3 58 82 4e ba |S..f...|K...X.N.|
|
||||
00000020 5a 46 53 7f ca 1f 1d a8 b9 77 18 20 48 92 50 46 |ZFS......w. H.PF|
|
||||
00000030 51 e4 56 02 8c a4 92 c9 51 f2 85 75 91 99 86 fb |Q.V.....Q..u....|
|
||||
00000040 c2 ab 5b 7c d0 bf 49 be 13 f3 91 3c 00 05 00 00 |..[|..I....<....|
|
||||
00000050 05 ff 01 00 01 00 16 03 01 02 59 0b 00 02 55 00 |..........Y...U.|
|
||||
00000060 02 52 00 02 4f 30 82 02 4b 30 82 01 b4 a0 03 02 |.R..O0..K0......|
|
||||
00000070 01 02 02 09 00 e8 f0 9d 3f e2 5b ea a6 30 0d 06 |........?.[..0..|
|
||||
|
@ -97,24 +97,24 @@
|
|||
00000270 70 0f 08 83 48 e9 48 ef 6e 50 8b 05 7e e5 84 25 |p...H.H.nP..~..%|
|
||||
00000280 fa 55 c7 ae 31 02 27 00 ef 3f 98 86 20 12 89 91 |.U..1.'..?.. ...|
|
||||
00000290 59 28 b4 f7 d7 af d2 69 61 35 16 03 01 00 91 0f |Y(.....ia5......|
|
||||
000002a0 00 00 8d 00 8b 30 81 88 02 42 01 14 05 eb 50 03 |.....0...B....P.|
|
||||
000002b0 82 c9 05 9b e2 71 7e a0 e5 7b fe 81 90 8e e9 9a |.....q~..{......|
|
||||
000002c0 34 56 f1 b2 77 6c 14 99 5f f4 26 a9 02 3a cc c1 |4V..wl.._.&..:..|
|
||||
000002d0 21 07 33 61 72 9a 6f 1f d1 ec a2 55 a4 98 5c 4d |!.3ar.o....U..\M|
|
||||
000002e0 4c 9e bd 44 2d be af a5 d3 85 cc 0f 02 42 00 b9 |L..D-........B..|
|
||||
000002f0 a5 93 92 ea 53 88 26 07 e9 26 d9 d9 25 ce e4 9f |....S.&..&..%...|
|
||||
00000300 10 eb 20 a7 7b 2a 23 32 a9 ec 65 4b dc 6b 35 ff |.. .{*#2..eK.k5.|
|
||||
00000310 23 c3 95 7a 67 79 6e 7d 80 39 b0 ad 2a 69 97 aa |#..zgyn}.9..*i..|
|
||||
00000320 d7 27 ca c5 1d 5f 6f 3a 84 aa cd 2e 8b a3 af f5 |.'..._o:........|
|
||||
00000330 14 03 01 00 01 01 16 03 01 00 24 69 5a 4e 16 a0 |..........$iZN..|
|
||||
00000340 af 2d 94 58 0c bb c6 95 39 f7 0e 7e c5 01 9b b3 |.-.X....9..~....|
|
||||
00000350 d8 22 e6 82 a8 1d 05 89 97 fa 9e 97 21 3f d9 |."..........!?.|
|
||||
000002a0 00 00 8d 00 8b 30 81 88 02 42 00 97 2e 05 89 ff |.....0...B......|
|
||||
000002b0 06 c2 8f d1 a9 e1 73 8e b5 a7 81 58 b8 a1 b0 18 |......s....X....|
|
||||
000002c0 df 42 e2 2f 6a a1 d9 dc b4 f4 63 d1 23 25 90 61 |.B./j.....c.#%.a|
|
||||
000002d0 98 58 3d 69 3c 06 ef f2 0c 13 b2 31 56 bd 0e 8f |.X=i<......1V...|
|
||||
000002e0 d4 4b 64 ea 30 aa 19 c8 86 f3 fd 46 02 42 00 94 |.Kd.0......F.B..|
|
||||
000002f0 eb 60 57 6b 26 0d 53 18 c6 73 6e 60 73 98 ff 2f |.`Wk&.S..sn`s../|
|
||||
00000300 f2 80 eb 73 02 26 e9 4f a5 42 3a 60 70 3c 52 7e |...s.&.O.B:`p<R~|
|
||||
00000310 3a 31 f1 a8 42 7b 44 36 31 94 1b bf 78 0f a8 6d |:1..B{D61...x..m|
|
||||
00000320 a6 fb f0 49 13 c6 71 6d 8f 44 a2 e0 41 cb ab fb |...I..qm.D..A...|
|
||||
00000330 14 03 01 00 01 01 16 03 01 00 24 09 60 3f a5 1d |..........$.`?..|
|
||||
00000340 8e b7 56 86 9b 6f 35 40 e7 e8 d6 1a ab fc f5 0d |..V..o5@........|
|
||||
00000350 c5 a6 d7 2c 44 4b 6b 6d 22 79 1e e8 a2 31 a3 |...,DKkm"y...1.|
|
||||
>>> Flow 4 (server to client)
|
||||
00000000 14 03 01 00 01 01 16 03 01 00 24 b1 bc 4d 8f 57 |..........$..M.W|
|
||||
00000010 7e 5b 37 91 e5 9e 31 35 de 1e ee 60 a5 b6 5b 91 |~[7...15...`..[.|
|
||||
00000020 bd 0f 65 ac e1 e5 4a 64 19 b4 f9 28 49 33 0f |..e...Jd...(I3.|
|
||||
00000000 14 03 01 00 01 01 16 03 01 00 24 3c c9 8b e2 93 |..........$<....|
|
||||
00000010 84 9e 3c ad e3 b6 9b 5f 4a e6 15 2b af d4 6f fa |..<...._J..+..o.|
|
||||
00000020 84 0d f6 77 25 03 62 08 60 f2 78 be 91 d3 d0 |...w%.b.`.x....|
|
||||
>>> Flow 5 (client to server)
|
||||
00000000 17 03 01 00 1a d5 db a0 bb d9 46 ac 46 76 91 a7 |..........F.Fv..|
|
||||
00000010 f6 d8 c9 6d 11 c8 3f 92 e1 a5 3d 19 9b 02 40 15 |...m..?...=...@.|
|
||||
00000020 03 01 00 16 65 ca 2b 25 c4 85 f8 82 a2 b3 3a 3a |....e.+%......::|
|
||||
00000030 0c 2f 4a e7 3b d5 bf 9f f9 61 |./J.;....a|
|
||||
00000000 17 03 01 00 1a 18 d9 62 5f b8 cb 21 4b 75 d4 28 |.......b_..!Ku.(|
|
||||
00000010 48 37 46 98 aa ec 5f f3 6b 22 b3 92 1c 13 e3 15 |H7F..._.k"......|
|
||||
00000020 03 01 00 16 13 94 43 e8 cf f3 7c 4f 2a c3 ee a0 |......C...|O*...|
|
||||
00000030 80 fd 55 43 70 da 9d 88 21 f6 |..UCp...!.|
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue