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

104
testdata/Client-TLSv10-ClientCert-RSA-ECDSA 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 ea f6 24 aa 4e |....Y...U....$.N|
00000010 7f 41 27 a0 25 60 92 a3 2e d1 e7 70 22 98 69 ff |.A'.%`.....p".i.|
00000020 e6 69 1d 27 7e 77 57 0b 3c 2d d6 20 6d 48 7a 69 |.i.'~wW.<-. mHzi|
00000030 e3 54 de d3 aa 99 c5 29 69 a0 aa 13 b9 e2 10 b8 |.T.....)i.......|
00000040 ed ea 3b 67 1c 18 7f 79 4b 4c 4d 24 c0 09 00 00 |..;g...yKLM$....|
00000000 16 03 01 00 59 02 00 00 55 03 01 96 29 16 36 60 |....Y...U...).6`|
00000010 65 c0 59 5e 39 1b ad 11 d4 c2 d4 ee 60 ed 7c 0a |e.Y^9.......`.|.|
00000020 72 20 d8 ed da 53 e0 a3 64 43 5b 20 68 13 96 67 |r ...S..dC[ h..g|
00000030 eb a5 c4 1f 31 48 d0 11 9d bc 63 64 1e b2 36 7c |....1H....cd..6||
00000040 48 f0 05 7e 81 2f 82 de 91 22 0d 74 c0 09 00 00 |H..~./...".t....|
00000050 0d ff 01 00 01 00 00 0b 00 04 03 00 01 02 16 03 |................|
00000060 01 02 0e 0b 00 02 0a 00 02 07 00 02 04 30 82 02 |.............0..|
00000070 00 30 82 01 62 02 09 00 b8 bf 2d 47 a0 d2 eb f4 |.0..b.....-G....|
@ -48,21 +48,21 @@
00000240 13 83 0d 94 06 bb d4 37 7a f6 ec 7a c9 86 2e dd |.......7z..z....|
00000250 d7 11 69 7f 85 7c 56 de fb 31 78 2b e4 c7 78 0d |..i..|V..1x+..x.|
00000260 ae cb be 9e 4e 36 24 31 7b 6a 0f 39 95 12 07 8f |....N6$1{j.9....|
00000270 2a 16 03 01 00 d5 0c 00 00 d1 03 00 17 41 04 47 |*............A.G|
00000280 9d b1 4c 73 76 f6 36 6f a7 4f 5b 22 2d 73 7b dc |..Lsv.6o.O["-s{.|
00000290 c7 7e 38 89 ec 37 ba a0 bc 63 86 c9 23 13 41 17 |.~8..7...c..#.A.|
000002a0 a1 e3 ba 0b 01 73 fe 73 23 6d b2 ab fc 2f bc 1e |.....s.s#m.../..|
000002b0 69 88 53 32 66 93 fe 47 76 d2 d1 25 73 4c fb 00 |i.S2f..Gv..%sL..|
000002c0 8a 30 81 87 02 42 01 54 88 ef 3c 8f ed 72 31 0d |.0...B.T..<..r1.|
000002d0 52 aa d7 2a be 26 d7 b9 35 57 e4 34 ae bb e9 87 |R..*.&..5W.4....|
000002e0 83 b8 fb b4 e6 e8 6f 19 41 96 7a 3e 6d 20 f7 22 |......o.A.z>m ."|
000002f0 ec 18 3b 27 82 07 8a d5 32 33 86 b7 a5 88 b8 e9 |..;'....23......|
00000300 83 a2 0e 37 3d 00 ff dc 02 41 7a 1d cd 44 f3 84 |...7=....Az..D..|
00000310 b9 53 f3 e2 18 0d ea c1 d9 07 87 e8 e3 94 90 1d |.S..............|
00000320 23 d7 b0 08 a9 e7 c1 0f 4c b9 41 4a 57 bb 23 51 |#.......L.AJW.#Q|
00000330 09 a6 f5 59 20 59 74 80 20 3c 23 60 07 e8 be c2 |...Y Yt. <#`....|
00000340 4c 4f fe dd 60 81 6e 4f 89 44 7f 16 03 01 00 0e |LO..`.nO.D......|
00000350 0d 00 00 06 03 01 02 40 00 00 0e 00 00 00 |.......@......|
00000270 2a 16 03 01 00 d6 0c 00 00 d2 03 00 17 41 04 17 |*............A..|
00000280 e7 29 66 88 e3 76 32 fb 5f 3d 44 5c 2e f3 9a f4 |.)f..v2._=D\....|
00000290 8b 68 24 b7 5a fa e6 41 9d f9 57 32 72 89 94 e9 |.h$.Z..A..W2r...|
000002a0 d4 0b ad ad c0 3c 08 ea c0 61 8b bc fd f8 cd 36 |.....<...a.....6|
000002b0 54 17 57 6f cb e7 8d 4c 35 49 35 27 3d b4 97 00 |T.Wo...L5I5'=...|
000002c0 8b 30 81 88 02 42 00 9c eb c1 18 55 df 1c ee e2 |.0...B.....U....|
000002d0 13 00 cb aa 54 d2 bc ae 8a 1f 15 24 ca f2 99 e7 |....T......$....|
000002e0 4d ec e0 74 a5 45 60 9f ec af 4c a7 72 4a 14 0a |M..t.E`...L.rJ..|
000002f0 c2 33 5b b0 c7 82 6e 55 85 1d e2 57 ad 58 cc 06 |.3[...nU...W.X..|
00000300 46 c5 5a f8 0a 6f ac bb 02 42 01 c6 5c 36 38 af |F.Z..o...B..\68.|
00000310 ed d2 2d c9 66 bf c3 ff 86 63 03 a4 57 d3 7b 91 |..-.f....c..W.{.|
00000320 9b 02 3f 94 79 d9 38 5d b5 46 80 ff 56 09 dc 91 |..?.y.8].F..V...|
00000330 4a 72 4c 2a 8b 35 d8 a0 f1 82 bc 79 1f 4d 57 1d |JrL*.5.....y.MW.|
00000340 eb a0 a3 f8 5e dd 74 5d c2 fc bc b4 16 03 01 00 |....^.t]........|
00000350 0e 0d 00 00 06 03 01 02 40 00 00 0e 00 00 00 |........@......|
>>> Flow 3 (client to server)
00000000 16 03 01 01 fd 0b 00 01 f9 00 01 f6 00 01 f3 30 |...............0|
00000010 82 01 ef 30 82 01 58 a0 03 02 01 02 02 10 5c 19 |...0..X.......\.|
@ -101,29 +101,29 @@
00000220 67 fd a7 24 20 3e b2 56 1c ce 97 28 5e f8 2b 2d |g..$ >.V...(^.+-|
00000230 4f 9e f1 07 9f 6c 4b 5b 83 56 e2 32 42 e9 58 b6 |O....lK[.V.2B.X.|
00000240 d7 49 a6 b5 68 1a 41 03 56 6b dc 5a 89 16 03 01 |.I..h.A.Vk.Z....|
00000250 00 86 0f 00 00 82 00 80 47 6e 9a a0 1e 03 07 8e |........Gn......|
00000260 50 cd ed f7 86 9d 52 43 1d d7 4b d8 9f d8 cc 04 |P.....RC..K.....|
00000270 6d 88 32 9e 4a d7 d5 c9 d8 9b 81 4f 9a f9 8e 67 |m.2.J......O...g|
00000280 9f 7a 47 ee 59 81 52 96 0b c2 bc a0 48 2a b8 a7 |.zG.Y.R.....H*..|
00000290 5b ed cc d0 d1 16 53 d7 1b cb e3 62 46 64 92 55 |[.....S....bFd.U|
000002a0 55 5a 40 88 f8 ed 2f 92 b6 db 2b e4 43 74 23 26 |UZ@.../...+.Ct#&|
000002b0 58 4f 5c ca 2f 0a 2c f8 9b c5 c6 d1 7f 7b 47 ab |XO\./.,......{G.|
000002c0 2f f1 b0 19 1d 9a fb 47 3a 74 88 1a 03 03 41 74 |/......G:t....At|
000002d0 ba 4b 53 64 d1 da a5 bf 14 03 01 00 01 01 16 03 |.KSd............|
000002e0 01 00 30 52 27 a8 12 25 ed 15 3e 07 84 13 7c 04 |..0R'..%..>...|.|
000002f0 4d 0d 33 17 2c c1 78 dc 1c e3 50 e5 95 be d0 c7 |M.3.,.x...P.....|
00000300 ba 9a b8 bb ed 2a c9 69 d9 4d b2 e1 16 58 0f 92 |.....*.i.M...X..|
00000310 ea dd b9 |...|
00000250 00 86 0f 00 00 82 00 80 43 ee ac 48 f3 bb 26 40 |........C..H..&@|
00000260 19 85 d5 05 63 44 5c 2c c9 ab b1 6d ad c2 03 f5 |....cD\,...m....|
00000270 f5 1d 16 08 fe 3a a9 90 97 8f d6 47 fa 20 80 bb |.....:.....G. ..|
00000280 07 6e 32 21 b5 95 de 89 43 ea a9 44 71 35 c7 84 |.n2!....C..Dq5..|
00000290 d1 c7 d7 74 e0 29 bd 19 51 86 bc 77 24 27 fb a3 |...t.)..Q..w$'..|
000002a0 f6 3f 85 dd ac d3 6d 84 3e bb 0c e2 8c 2e 1a db |.?....m.>.......|
000002b0 18 a2 4f c7 d2 5c 3a db 0c fa f3 3e 6e 1d 65 da |..O..\:....>n.e.|
000002c0 3b 1a df 35 00 d0 ee 1b 2e 59 fe 18 50 3d b1 56 |;..5.....Y..P=.V|
000002d0 82 7c c9 5a 4b 8a e8 9a 14 03 01 00 01 01 16 03 |.|.ZK...........|
000002e0 01 00 30 1b 1f 0e e0 90 f4 1f b1 cc 3e e5 cb 58 |..0.........>..X|
000002f0 6a b2 f9 97 04 d2 17 33 2e b0 c9 34 4a 2e 27 0d |j......3...4J.'.|
00000300 e1 30 86 b4 bc e3 1f 35 2a 6f bc d7 72 5c b5 32 |.0.....5*o..r\.2|
00000310 cf 19 19 |...|
>>> Flow 4 (server to client)
00000000 14 03 01 00 01 01 16 03 01 00 30 dc 0d a4 5d 9e |..........0...].|
00000010 ae 1d 16 97 1d d9 29 6a 3f 23 52 df 01 30 db 13 |......)j?#R..0..|
00000020 aa 6e c9 90 1b 7a c6 97 b2 be a5 8e 37 2d a8 a9 |.n...z......7-..|
00000030 a1 e4 29 4e 28 56 3d 91 b3 ca 0b |..)N(V=....|
00000000 14 03 01 00 01 01 16 03 01 00 30 fb 0a 0c da b5 |..........0.....|
00000010 4e fa e0 6b 34 d6 39 b6 33 17 c5 24 38 87 c9 2c |N..k4.9.3..$8..,|
00000020 59 b0 f6 46 92 41 7b 35 2f 51 b5 fc 0b ed c1 23 |Y..F.A{5/Q.....#|
00000030 42 4d 0f 68 eb 7b ae 27 ee 70 4c |BM.h.{.'.pL|
>>> Flow 5 (client to server)
00000000 17 03 01 00 20 24 c7 5d 53 82 8c 21 50 6e 3f 77 |.... $.]S..!Pn?w|
00000010 1e de 56 f8 a5 25 7b ae 98 34 c9 76 dc ba 1d 6a |..V..%{..4.v...j|
00000020 af 59 8b 4e 9c 17 03 01 00 20 9b f3 33 5e 9b f9 |.Y.N..... ..3^..|
00000030 d2 05 df 72 64 bd e9 98 0d f9 03 c4 80 22 c5 41 |...rd........".A|
00000040 46 1d 05 09 ef 99 32 80 ec 65 15 03 01 00 20 4c |F.....2..e.... L|
00000050 f0 81 72 b0 31 52 3c c1 3c b9 95 7d f0 ea e3 a2 |..r.1R<.<..}....|
00000060 c1 a6 3a 8d 34 b4 cf 41 c8 2b f4 e7 c4 dc 47 |..:.4..A.+....G|
00000000 17 03 01 00 20 f0 73 c9 22 ac 02 f3 d7 26 fe ba |.... .s."....&..|
00000010 fa de 6f a5 51 50 2f 4a 13 e8 36 c2 29 ff 68 4d |..o.QP/J..6.).hM|
00000020 6e 87 a0 e8 aa 17 03 01 00 20 60 bb 97 5f cb 4f |n........ `.._.O|
00000030 46 23 a9 03 49 8a 82 cb 22 b2 05 9d c4 4f 83 c1 |F#..I..."....O..|
00000040 47 e3 b0 58 e2 cc 46 b7 49 18 15 03 01 00 20 54 |G..X..F.I..... T|
00000050 ae d6 e1 bf 61 5c 9f b3 f8 dc dc e7 33 84 d3 aa |....a\......3...|
00000060 23 fa 02 ef dc d1 93 96 1d e3 a1 02 c5 30 9c |#............0.|