crypto/tls: prevent the test server from sending session tickets

Since they are sent after the handshake in TLS 1.3, the client was not actually consuming them, as it doesn't make any Read calls. They were then sitting in the kernel receive buffer when the client would call Close. The kernel would see that and send a RST, which would race the closeNotify, causing errors. Also, we get to trim 600 lines of useless test data. Fixes golang#28852 Change-Id: I7517feab77dabab7504bfc111098ba09ea07ae5e Reviewed-on: https://go-review.googlesource.com/c/151659 Reviewed-by: Ian Lance Taylor <[email protected]>
2bt · Nov 29, 2018 · 4c51c93 · 4c51c93
1 parent 4f26f24
commit 4c51c93
Show file tree

Hide file tree

Showing 14 changed files with 1,162 additions and 1,763 deletions.
diff --git a/src/crypto/tls/handshake_client_test.go b/src/crypto/tls/handshake_client_test.go
diff --git a/src/crypto/tls/testdata/Client-TLSv13-AES128-SHA256 b/src/crypto/tls/testdata/Client-TLSv13-AES128-SHA256
@@ -16,107 +16,75 @@
 000000e0  a3 47 cd 62 43 15 28 da  ac 5f bb 29 07 30 ff f6  |.G.bC.(.._.).0..|
 000000f0  84 af c4 cf c2 ed 90 99  5f 58 cb 3b 74           |........_X.;t|
 >>> Flow 2 (server to client)
-00000000  16 03 03 00 7a 02 00 00  76 03 03 cb 6b 3c f1 71  |....z...v...k<.q|
-00000010  7d fb a1 03 ad d3 35 fb  fa 9f f5 1b 58 62 c3 83  |}.....5.....Xb..|
-00000020  18 d1 63 9f 14 57 e6 2d  82 f2 37 20 00 00 00 00  |..c..W.-..7 ....|
+00000000  16 03 03 00 7a 02 00 00  76 03 03 e6 6e e6 44 9a  |....z...v...n.D.|
+00000010  c9 e2 51 58 ac ba 02 48  ea 6f dd 09 7a 08 04 d2  |..QX...H.o..z...|
+00000020  df b6 96 2f 31 d4 6b bf  ab 0e 8e 20 00 00 00 00  |.../1.k.... ....|
 00000030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00000040  00 00 00 00 00 00 00 00  00 00 00 00 13 01 00 00  |................|
-00000050  2e 00 2b 00 02 03 04 00  33 00 24 00 1d 00 20 50  |..+.....3.$... P|
-00000060  5a 0c d6 69 92 a1 c7 2f  57 41 f3 29 b4 d3 a3 d3  |Z..i.../WA.)....|
-00000070  b5 62 85 2a 1d 12 dc 46  d1 ac 96 b6 16 a5 39 14  |.b.*...F......9.|
-00000080  03 03 00 01 01 17 03 03  00 17 1d a4 67 9f ac 28  |............g..(|
-00000090  dc fe 5c 58 be c0 d0 72  9d 77 05 96 1a 9c ac 54  |..\X...r.w.....T|
-000000a0  a2 17 03 03 02 6d 99 b0  fc 88 2d c2 fe 5b 84 1d  |.....m....-..[..|
-000000b0  38 f4 b9 70 87 b7 45 94  a5 09 e4 a3 2f 93 9a 9b  |8..p..E...../...|
-000000c0  ef 1f 80 a5 69 1d 81 47  d5 3e e0 f3 8e cd 1e 11  |....i..G.>......|
-000000d0  ab 2d a1 1d a7 06 9c fd  b4 dd aa 66 3e 8c e0 2f  |.-.........f>../|
-000000e0  cd e3 9a df 30 b4 c1 70  b0 be 2a 62 ba 3f f6 79  |....0..p..*b.?.y|
-000000f0  aa 74 8b f4 4f 3e bc 5c  32 25 29 69 32 d4 90 6a  |.t..O>.\2%)i2..j|
-00000100  45 45 c5 93 94 4f 90 02  9c 23 45 e0 88 14 ae 6c  |EE...O...#E....l|
-00000110  e7 be 20 4e 47 ea 50 8e  a0 c9 74 67 d2 97 d7 31  |.. NG.P...tg...1|
-00000120  52 7e f7 5a a0 55 51 c8  8f 91 12 12 d7 0e 2b a5  |R~.Z.UQ.......+.|
-00000130  ff 6c 5e 46 0d 2f d7 55  b6 c0 24 e1 5f e2 66 a0  |.l^F./.U..$._.f.|
-00000140  32 c6 cf 88 d2 35 ec fd  17 1a ec 06 19 21 5b 6c  |2....5.......![l|
-00000150  eb ac 71 0a e6 3b d3 ea  51 05 33 45 28 ef 0b 25  |..q..;..Q.3E(..%|
-00000160  7d 77 f1 76 6e fe f8 ef  74 21 ff 3b 7d 69 20 f2  |}w.vn...t!.;}i .|
-00000170  7f 99 58 cd 8a 1a ab 87  c7 b0 9c a5 77 d7 b6 54  |..X.........w..T|
-00000180  27 e5 5d ac 25 b7 7a 4a  4e 8a 74 cd 17 bf 86 4b  |'.].%.zJN.t....K|
-00000190  d4 fd a7 74 3f 03 68 d6  67 cf 05 3d 13 95 81 62  |...t?.h.g..=...b|
-000001a0  80 1a f7 d3 3c 39 3d 8b  8c 68 20 4a c4 ee 16 06  |....<9=..h J....|
-000001b0  5d 2f 3c cf 0d 26 0b 14  1a 4f 64 e4 25 c3 b5 63  |]/<..&...Od.%..c|
-000001c0  86 32 82 78 ad 3e 79 c8  c8 e5 29 78 4a a5 98 81  |.2.x.>y...)xJ...|
-000001d0  57 61 e9 3c dc f1 88 ba  a9 5b 8d e1 c1 08 a8 ed  |Wa.<.....[......|
-000001e0  c8 06 3b f7 7a 60 c7 f2  cd ea 2f 7e 0c 30 1d 2b  |..;.z`..../~.0.+|
-000001f0  e4 d6 e3 46 2d 2f d5 26  4f 63 a4 b7 7a ff 8b 29  |...F-/.&Oc..z..)|
-00000200  21 06 53 8d 99 57 f7 63  c6 72 96 cc 47 9a 80 cc  |!.S..W.c.r..G...|
-00000210  03 d5 96 3b bc ad 05 7e  49 f5 6f e6 f7 8c ae 55  |...;...~I.o....U|
-00000220  b9 59 98 a6 93 22 43 9d  62 d9 ae ba 80 c6 82 e4  |.Y..."C.b.......|
-00000230  d9 44 36 de ec dc 89 f3  45 ee bd 58 ff f5 fa de  |.D6.....E..X....|
-00000240  85 9b 0f fe 48 a1 0f 36  a4 ff f8 43 7b 18 74 49  |....H..6...C{.tI|
-00000250  87 d6 bd f0 2b b3 fd 00  8a 86 8c d1 c1 7d 66 38  |....+........}f8|
-00000260  f7 f9 72 36 77 17 7d 18  1c e6 4b 23 30 0c a4 e7  |..r6w.}...K#0...|
-00000270  34 a9 39 83 3c 25 d1 de  0d f4 61 85 7b 01 92 9f  |4.9.<%....a.{...|
-00000280  e7 47 08 e2 fa 84 59 97  8c c5 55 47 27 4f 00 da  |.G....Y...UG'O..|
-00000290  ab 88 bf b8 fe 84 36 5f  b4 f1 f1 28 75 55 29 af  |......6_...(uU).|
-000002a0  b8 a9 1b 46 dc 65 c7 97  27 4c 9a dc 00 59 3a 02  |...F.e..'L...Y:.|
-000002b0  05 2e ed b0 f1 30 74 14  dd 51 08 44 b2 9f 38 1c  |.....0t..Q.D..8.|
-000002c0  03 3c 8f 00 ad 28 e9 27  bd 75 c3 4a f6 70 5e 79  |.<...(.'.u.J.p^y|
-000002d0  7e 38 b3 df 5a 4f 69 11  f2 37 2f 52 cd cc f9 35  |~8..ZOi..7/R...5|
-000002e0  16 49 01 24 32 8a e6 da  6b 4e a8 92 a0 d7 73 7b  |.I.$2...kN....s{|
-000002f0  fb 4c 0f 00 0e 82 d7 27  d3 22 f9 82 de 41 0b 1a  |.L.....'."...A..|
-00000300  2e d3 6c 97 cb 53 b0 6c  25 b5 65 86 8e 50 87 e0  |..l..S.l%.e..P..|
-00000310  4b e6 6d 17 03 03 00 99  e1 28 35 0e 69 35 4a 55  |K.m......(5.i5JU|
-00000320  12 ab 1c 8d 43 b4 a4 44  2b 56 3c 5d c6 1b 3a a8  |....C..D+V<]..:.|
-00000330  df 0a e8 5d c2 a6 4f 83  c0 dc 07 87 53 0c 1f 63  |...]..O.....S..c|
-00000340  e2 db f0 f7 16 e9 e8 f5  5f 5a f9 b1 f1 8d 36 1d  |........_Z....6.|
-00000350  53 47 60 3f ea 22 f7 6c  7c e7 e6 79 b1 85 f2 27  |SG`?.".l|..y...'|
-00000360  5c ef 1e 99 52 5f 06 67  b3 8b 6d 13 83 06 c0 06  |\...R_.g..m.....|
-00000370  ef fa 1b 9f 92 ec 5b e5  b3 25 64 79 6c 90 11 e1  |......[..%dyl...|
-00000380  13 61 5b bf e9 4f 08 35  81 80 86 b7 77 ae 52 29  |.a[..O.5....w.R)|
-00000390  9b 24 1e b0 55 23 ca 69  2f be d1 01 38 e8 79 a8  |.$..U#.i/...8.y.|
-000003a0  e2 f7 61 0f 32 ca ff 09  44 84 84 79 19 22 54 1e  |..a.2...D..y."T.|
-000003b0  22 17 03 03 00 35 00 a1  ea bc bd 87 41 67 cc 5e  |"....5......Ag.^|
-000003c0  2f 4b 1c 52 c2 56 2c 69  7e 69 9b a3 06 69 b5 0b  |/K.R.V,i~i...i..|
-000003d0  6c 2e 1f de 53 9d 82 22  b7 36 9f ac 0e 7a 83 e5  |l...S..".6...z..|
-000003e0  18 30 5b a9 b7 15 5a 16  87 97 1b                 |.0[...Z....|
+00000050  2e 00 2b 00 02 03 04 00  33 00 24 00 1d 00 20 98  |..+.....3.$... .|
+00000060  b2 16 47 4d 82 da 23 5b  2a a4 63 29 11 a8 d4 c0  |..GM..#[*.c)....|
+00000070  0b 5e 2d 73 0d d6 e7 1e  15 78 1a c2 58 93 70 14  |.^-s.....x..X.p.|
+00000080  03 03 00 01 01 17 03 03  00 17 c3 65 82 87 0c 61  |...........e...a|
+00000090  57 28 08 d5 da fc 59 8d  a3 76 49 0f d5 80 68 3d  |W(....Y..vI...h=|
+000000a0  03 17 03 03 02 6d c5 f1  b7 8a 61 03 06 9e 0f 3b  |.....m....a....;|
+000000b0  be 71 5b 29 17 c7 ed 0e  23 40 90 c6 7a 22 4e ad  |.q[)....#@..z"N.|
+000000c0  d5 f1 60 f6 db d9 37 73  1f b6 43 f7 7b fe 7b aa  |..`...7s..C.{.{.|
+000000d0  f7 16 28 e5 a8 b6 be 69  da 79 09 b5 dc ab bf d3  |..(....i.y......|
+000000e0  36 ca 19 ae 8c de 27 5c  0d 44 5e 4a e2 ac ff bc  |6.....'\.D^J....|
+000000f0  33 4e 35 d3 8d 21 22 4d  12 38 e2 f9 73 3b 3d d1  |3N5..!"M.8..s;=.|
+00000100  a7 b1 06 6a 6a 8d 25 0f  47 b1 d1 f2 da 32 cc 58  |...jj.%.G....2.X|
+00000110  9e 78 b6 b4 4e c1 bc 9d  91 38 44 ff 35 71 a7 c3  |.x..N....8D.5q..|
+00000120  39 67 5b 50 b1 9b 87 5d  fd 6d 87 42 25 10 1a 19  |9g[P...].m.B%...|
+00000130  e1 95 19 2f a1 2c 95 6e  ce 6c c9 d9 92 1d e6 7f  |.../.,.n.l......|
+00000140  9d d0 98 60 f3 6c cf 64  8e 66 bb a4 af de 1e b6  |...`.l.d.f......|
+00000150  6a 6d 7b 11 a7 ca e1 29  49 f3 57 50 73 e8 36 79  |jm{....)I.WPs.6y|
+00000160  81 fe 33 f7 04 1a 04 e3  60 8e e7 11 fa 07 bb 79  |..3.....`......y|
+00000170  73 c0 b7 5e 0f 61 b7 3a  50 85 a4 e1 8e 3b a3 43  |s..^.a.:P....;.C|
+00000180  79 8a 14 78 0a ff 66 b4  c3 c0 fe 0a 6a c6 66 72  |y..x..f.....j.fr|
+00000190  a8 8a e1 9c a6 ad ee 74  53 d9 b8 07 17 b3 9b f6  |.......tS.......|
+000001a0  eb 28 1b 64 97 aa 17 fa  80 36 cb b1 35 6e ec e1  |.(.d.....6..5n..|
+000001b0  16 1f ba 00 0c 26 fb 17  0e 00 8a e3 28 0d 6a 76  |.....&......(.jv|
+000001c0  8c 78 ee 55 02 78 66 90  5b 87 f2 16 e2 af ef fb  |.x.U.xf.[.......|
+000001d0  a1 f3 8f fd b9 8e e3 16  68 7a ec c0 54 2f 88 c4  |........hz..T/..|
+000001e0  08 6c 55 48 58 56 ac 3e  26 5b 67 42 18 72 6e a1  |.lUHXV.>&[gB.rn.|
+000001f0  b5 86 cf 55 d1 29 c5 9b  2c 7b 7d f3 a5 26 2e 5e  |...U.)..,{}..&.^|
+00000200  21 3a 40 97 5a c1 c8 13  3d c3 12 4e d8 88 e1 8f  |!:@.Z...=..N....|
+00000210  e8 c5 d3 9b 0f 49 24 42  da 27 ac e5 5e 21 2e 2c  |.....I$B.'..^!.,|
+00000220  8b 27 ae c4 39 49 6f 43  69 a3 e4 0d f1 fc 62 9f  |.'..9IoCi.....b.|
+00000230  be 65 78 01 d8 c8 4e 0f  b5 d7 12 d1 fc 73 cc 6e  |.ex...N......s.n|
+00000240  cc df d3 df 33 e4 f8 8e  4f 82 60 cd 1f a1 71 74  |....3...O.`...qt|
+00000250  20 7a e2 46 fc 7a 83 15  dc 6c 5d b3 4f 92 de a2  | z.F.z...l].O...|
+00000260  99 b5 33 4e b0 5d 19 0f  84 ae de 65 2e ee ef 40  |..3N.].....e...@|
+00000270  e9 5b c6 53 86 0d 88 fc  2a b2 2c 5c 76 66 95 a7  |.[.S....*.,\vf..|
+00000280  96 ad 7f ba 27 ea e4 54  5e 77 97 0d 6f 9e b8 e5  |....'..T^w..o...|
+00000290  b7 2f 75 13 42 7e 61 08  e3 69 31 d4 e6 d0 c0 6d  |./u.B~a..i1....m|
+000002a0  e3 e2 e4 69 5d d0 7d c2  f1 48 a1 e0 23 f1 19 81  |...i].}..H..#...|
+000002b0  23 ed a7 ac ed 88 70 60  c6 eb cf 11 23 39 cb 91  |#.....p`....#9..|
+000002c0  35 3b 32 6c 20 fc 61 cb  49 77 9c d9 5d e2 b4 41  |5;2l .a.Iw..]..A|
+000002d0  b9 c6 22 af 36 e4 a4 c4  45 47 f4 53 3f 7f b4 25  |..".6...EG.S?..%|
+000002e0  a0 34 f4 40 42 04 17 63  3b fa 05 35 c3 76 ec f7  |.[email protected];..5.v..|
+000002f0  b3 ee 62 fb 03 dc 06 22  90 4b fd 07 62 3b cd 27  |..b....".K..b;.'|
+00000300  da 87 32 73 3d 46 5c e7  b6 22 f7 02 8e 43 f4 46  |..2s=F\.."...C.F|
+00000310  79 cb 9b 17 03 03 00 99  81 e1 c1 b3 1d 11 4b 61  |y.............Ka|
+00000320  6a 4a f2 9a 97 52 36 2a  fc ef 77 54 aa 28 a7 4f  |jJ...R6*..wT.(.O|
+00000330  46 c5 69 2a a7 d7 da d6  ff 28 b1 21 3b 66 ac a7  |F.i*.....(.!;f..|
+00000340  ff 66 0a 10 20 1d 24 9b  f3 46 1a a7 04 4b b5 3d  |.f.. .$..F...K.=|
+00000350  e8 49 fc 3a f0 74 a8 02  b9 2d 5d e4 de 91 ef 4d  |.I.:.t...-]....M|
+00000360  ab 47 10 2c ba 70 c1 aa  a9 79 a8 96 27 71 90 e3  |.G.,.p...y..'q..|
+00000370  91 4d 4e dd 96 e0 4c ad  c5 0b 44 0a c0 4d 17 42  |.MN...L...D..M.B|
+00000380  65 12 8a ba fb 7c 66 7c  92 61 87 07 cd e3 a0 16  |e....|f|.a......|
+00000390  8b 94 23 77 85 70 88 d2  22 64 14 16 b5 ab db 6a  |..#w.p.."d.....j|
+000003a0  b9 23 26 ee c8 33 6e 9b  a6 e4 d1 85 d2 81 3a 5d  |.#&..3n.......:]|
+000003b0  33 17 03 03 00 35 b2 85  a7 fd fc 27 46 25 8f cd  |3....5.....'F%..|
+000003c0  ac ff 84 0a 54 cf f2 11  94 41 d0 7e 04 50 61 7d  |....T....A.~.Pa}|
+000003d0  71 40 df bc 48 0f c1 32  50 83 5c 05 c9 a5 02 95  |[email protected].\.....|
+000003e0  77 04 8c 76 ee 44 32 44  94 e3 8b                 |w..v.D2D...|
 >>> Flow 3 (client to server)
-00000000  14 03 03 00 01 01 17 03  03 00 35 23 b7 8d d5 9b  |..........5#....|
-00000010  e4 f6 21 27 94 5b 11 76  5c 1f ff f3 19 f8 43 a2  |..!'.[.v\.....C.|
-00000020  4d 07 68 00 a1 de 53 c9  80 f9 e7 fa 56 2c 6b b8  |M.h...S.....V,k.|
-00000030  bc 09 5e 61 ea 0c da c8  89 1c 41 95 55 0d ef 94  |..^a......A.U...|
-00000040  17 03 03 00 17 9a 18 9a  29 27 19 1b 06 da 82 78  |........)'.....x|
-00000050  da 9a 91 77 36 47 ce 25  72 dc b9 26              |...w6G.%r..&|
->>> Flow 4 (server to client)
-00000000  17 03 03 00 ea d6 5f a3  a5 14 87 cc 16 54 4c a0  |......_......TL.|
-00000010  57 34 92 34 4d 37 fb 27  2b 71 f7 cf ac 93 96 87  |W4.4M7.'+q......|
-00000020  9a 1f 8d 58 cf 3a 0d 8c  00 e2 03 b1 6e e1 9f d3  |...X.:......n...|
-00000030  f4 dc 17 73 70 59 52 03  a7 fc 99 cb d2 2d 0e c8  |...spYR......-..|
-00000040  91 5c 18 42 a3 20 9b 1c  20 86 bc 15 71 5b b4 7d  |.\.B. .. ...q[.}|
-00000050  80 8d cf 1d 15 33 b8 aa  66 9d f0 f9 08 dc 7c 78  |.....3..f.....|x|
-00000060  b7 12 48 11 e1 00 1c e7  3e b3 8b fe bf 07 6d 6d  |..H.....>.....mm|
-00000070  4c 7b 16 90 cb 8c da 03  a8 81 94 5c 76 09 c4 bf  |L{.........\v...|
-00000080  26 b4 2b fd 9c 44 b5 c0  49 4b 83 58 70 80 8f 7f  |&.+..D..IK.Xp...|
-00000090  1e f8 d0 b4 5d 6e a2 78  f0 8c 9d 0b e8 1a 0b b4  |....]n.x........|
-000000a0  66 7e 74 88 35 a4 d0 a3  ab 6c b5 2a 90 3c ba 09  |f~t.5....l.*.<..|
-000000b0  9c 4e 72 b7 9a ba f9 1f  bb a9 bf 03 94 43 7a d2  |.Nr..........Cz.|
-000000c0  25 2f c5 e8 83 89 37 1f  ac 7b 22 7c 01 7e dc 97  |%/....7..{"|.~..|
-000000d0  b3 05 5c 60 5b 22 2f be  8c 05 e8 1a a6 51 45 13  |..\`["/......QE.|
-000000e0  7f 20 b9 24 f0 a6 7c 1d  21 37 b8 6c 47 9e e8 17  |. .$..|.!7.lG...|
-000000f0  03 03 00 ea c1 05 ef 9c  bf 4c 1a d9 36 0d d4 d0  |.........L..6...|
-00000100  68 47 ac 8b c6 13 71 17  94 e7 74 8e 21 78 91 79  |hG....q...t.!x.y|
-00000110  50 19 4e 43 0d f7 e9 a9  62 e5 25 17 67 3e 38 27  |P.NC....b.%.g>8'|
-00000120  dd 3b 5d e9 ec cb 0f b7  1f aa bd 75 76 f7 88 b8  |.;]........uv...|
-00000130  c6 60 2f b7 ad 89 17 bb  bd d2 86 55 72 bd 52 10  |.`/........Ur.R.|
-00000140  21 4d 92 2d c1 a8 24 18  63 ca 0a 38 90 6b 39 5c  |!M.-..$.c..8.k9\|
-00000150  76 58 ad 62 e5 57 e0 b5  d5 af c9 9b 64 84 76 48  |vX.b.W......d.vH|
-00000160  4d 7f a7 32 09 50 f7 9e  92 ad ed 8e b5 0f 10 27  |M..2.P.........'|
-00000170  45 bc 58 fd be 91 35 97  ec 71 af d5 6a e1 04 26  |E.X...5..q..j..&|
-00000180  00 b3 91 4f a2 be ba b8  06 f1 2f 43 21 a6 0b ba  |...O....../C!...|
-00000190  43 b5 dd a6 cd a6 b1 1c  37 28 90 26 c4 af 71 56  |C.......7(.&..qV|
-000001a0  26 4d 39 39 60 88 8d ae  d1 3e 6e 7e 15 cb 60 1c  |&M99`....>n~..`.|
-000001b0  d2 00 c3 02 b6 2b 81 ea  60 1b 3a a8 a4 dc 29 c0  |.....+..`.:...).|
-000001c0  df 86 41 b8 27 89 3a ca  bc 31 19 ca 18 08 9e 96  |..A.'.:..1......|
-000001d0  e7 b4 6b 78 8d d4 9a 75  1a 48 fb 49 6a 29        |..kx...u.H.Ij)|
->>> Flow 5 (client to server)
-00000000  17 03 03 00 13 d5 5b 3c  bb 8b 4d f2 c2 d8 dc 0b  |......[<..M.....|
-00000010  5a 94 49 38 ed 11 91 8a                           |Z.I8....|
+00000000  14 03 03 00 01 01 17 03  03 00 35 11 f3 e0 d9 39  |..........5....9|
+00000010  43 24 33 e1 54 01 5d f2  c7 50 21 9f db 2d 31 81  |C$3.T.]..P!..-1.|
+00000020  3f d5 9c cb 59 cb 24 40  2a 77 da 0a 9e 52 12 11  |?...Y.$@*w...R..|
+00000030  1e a8 f8 e2 f2 9e 32 6c  06 8c 48 e8 bf 9d ef 0f  |......2l..H.....|
+00000040  17 03 03 00 17 bc a1 a2  8a a1 6c c3 19 d1 49 7f  |..........l...I.|
+00000050  57 af 58 5b ff 7b 11 b2  bb 45 3c 6f 17 03 03 00  |W.X[.{...E<o....|
+00000060  13 54 2f ac 2b 0f 9d de  27 bc f6 90 e5 ef f3 fd  |.T/.+...'.......|
+00000070  f7 cd 07 f9                                       |....|