crypto/tls: implement TLS 1.3 middlebox compatibility mode

Looks like the introduction of CCS records in the client second flight
gave time to s_server to send NewSessionTicket messages in between the
client application data and close_notify. There seems to be no way of
turning NewSessionTicket messages off, neither by not sending a
psk_key_exchange_modes extension, nor by command line flag.

Interleaving the client write like that tickled an issue akin to #18701:
on Windows, the client reaches Close() before the last record is drained
from the send buffer, the kernel notices and resets the connection,
cutting short the last flow. There is no good way of synchronizing this,
so we sleep for a RTT before calling close, like in CL 75210. Sigh.

Updates #9671

Change-Id: I44dc1cca17b373695b5a18c2741f218af2990bd1
Reviewed-on: https://go-review.googlesource.com/c/147419
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Adam Langley <agl@golang.org>

1 files changed, 77 insertions, 77 deletions

diff --git a/src/crypto/tls/testdata/Server-TLSv13-RSA-RSAPSS b/src/crypto/tls/testdata/Server-TLSv13-RSA-RSAPSS
index 01cc23032a..b3ff6f2aec 100644
--- a/src/crypto/tls/testdata/Server-TLSv13-RSA-RSAPSS
+++ b/src/crypto/tls/testdata/Server-TLSv13-RSA-RSAPSS
@@ -1,90 +1,90 @@
 >>> Flow 1 (client to server)
-00000000  16 03 01 00 c6 01 00 00  c2 03 03 f0 a4 89 8f b9  |................|
-00000010  fd ba d7 9f 2d ca bf f0  7a 6e 04 6a b4 54 9d f4  |....-...zn.j.T..|
-00000020  dd b5 e5 c9 f7 4f e1 a4  0c a9 72 20 57 d4 f7 3a  |.....O....r W..:|
-00000030  88 0a d3 95 c7 3a 4c 7c  e3 0c ac 99 bc 24 d7 ad  |.....:L|.....$..|
-00000040  3f 53 07 08 00 aa c3 e5  2c 2b d3 2f 00 08 13 02  |?S......,+./....|
+00000000  16 03 01 00 c6 01 00 00  c2 03 03 e9 1f 49 f4 6e  |.............I.n|
+00000010  6a 47 e9 46 ae 43 1b b4  00 98 20 27 a7 a6 21 76  |jG.F.C.... '..!v|
+00000020  fc 6b 35 d7 12 33 28 fb  2d 00 69 20 c9 28 5e 43  |.k5..3(.-.i .(^C|
+00000030  c9 36 a0 b9 c4 68 0f fd  d3 ce c6 39 3c 17 26 b1  |.6...h.....9<.&.|
+00000040  4c d5 36 50 59 fd cd 47  8f 43 eb 33 00 08 13 02  |L.6PY..G.C.3....|
 00000050  13 03 13 01 00 ff 01 00  00 71 00 00 00 0e 00 0c  |.........q......|
 00000060  00 00 09 31 32 37 2e 30  2e 30 2e 31 00 0b 00 04  |...127.0.0.1....|
 00000070  03 00 01 02 00 0a 00 0c  00 0a 00 1d 00 17 00 1e  |................|
 00000080  00 19 00 18 00 16 00 00  00 17 00 00 00 0d 00 04  |................|
 00000090  00 02 08 04 00 2b 00 03  02 03 04 00 2d 00 02 01  |.....+......-...|
-000000a0  01 00 33 00 26 00 24 00  1d 00 20 ef 5d 96 0f 42  |..3.&.$... .]..B|
-000000b0  9a fe c1 40 ee 31 cd 34  6d 11 d2 ad e9 99 9b b6  |...@.1.4m.......|
-000000c0  70 27 8f dc 81 c2 a6 ac  90 3f 4b                 |p'.......?K|
+000000a0  01 00 33 00 26 00 24 00  1d 00 20 a4 ab a1 75 b6  |..3.&.$... ...u.|
+000000b0  95 db 0e d6 fd 95 57 3b  3f 08 5e cd cc 19 d0 7b  |......W;?.^....{|
+000000c0  7b cd 67 34 d3 da 65 e5  e6 8d 0c                 |{.g4..e....|
 >>> Flow 2 (server to client)
 00000000  16 03 03 00 7a 02 00 00  76 03 03 00 00 00 00 00  |....z...v.......|
 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 20 57 d4 f7 3a  |........... W..:|
-00000030  88 0a d3 95 c7 3a 4c 7c  e3 0c ac 99 bc 24 d7 ad  |.....:L|.....$..|
-00000040  3f 53 07 08 00 aa c3 e5  2c 2b d3 2f 13 02 00 00  |?S......,+./....|
+00000020  00 00 00 00 00 00 00 00  00 00 00 20 c9 28 5e 43  |........... .(^C|
+00000030  c9 36 a0 b9 c4 68 0f fd  d3 ce c6 39 3c 17 26 b1  |.6...h.....9<.&.|
+00000040  4c d5 36 50 59 fd cd 47  8f 43 eb 33 13 02 00 00  |L.6PY..G.C.3....|
 00000050  2e 00 2b 00 02 03 04 00  33 00 24 00 1d 00 20 2f  |..+.....3.$... /|
 00000060  e5 7d a3 47 cd 62 43 15  28 da ac 5f bb 29 07 30  |.}.G.bC.(.._.).0|
-00000070  ff f6 84 af c4 cf c2 ed  90 99 5f 58 cb 3b 74 17  |.........._X.;t.|
-00000080  03 03 00 17 e9 da 29 cf  f2 21 32 b3 92 c0 18 5b  |......)..!2....[|
-00000090  26 f6 c8 ed eb 67 5c 9c  df 5c f2 17 03 03 02 6d  |&....g\..\.....m|
-000000a0  c8 d6 15 36 38 ef 64 62  1b 49 c8 c9 bc ce f7 99  |...68.db.I......|
-000000b0  da da 8e d0 2f 98 b1 cf  9a fa 53 cf 8a 20 11 6c  |..../.....S.. .l|
-000000c0  25 10 fc fd b2 f1 22 ea  42 64 21 b5 2f 94 9a 0a  |%.....".Bd!./...|
-000000d0  d3 3e 3b 14 4e b1 d1 3e  fb 40 03 54 af d3 9e ea  |.>;.N..>.@.T....|
-000000e0  c8 fb b2 ed ff fa c1 1d  7e 72 fb bd dd 04 b2 0c  |........~r......|
-000000f0  ac 33 4c 1b e4 65 2f 91  c1 3e f1 1a 8f e0 92 23  |.3L..e/..>.....#|
-00000100  3a 4d 04 f2 4f 14 d4 bb  fe f7 fe 6a 69 8b aa 15  |:M..O......ji...|
-00000110  c4 97 dd 06 3c 79 1c c9  aa 77 51 ac 95 8e 50 f8  |....<y...wQ...P.|
-00000120  0c b4 d1 b7 1e 3d 68 8b  4e e7 28 c3 df 79 3f 66  |.....=h.N.(..y?f|
-00000130  31 a5 06 28 8d 3f 49 d6  de fd 32 dd 10 79 5e d5  |1..(.?I...2..y^.|
-00000140  77 4e 88 20 b5 e1 cc 96  b9 73 23 ca 09 25 30 3e  |wN. .....s#..%0>|
-00000150  2a be aa 06 e7 22 cd 8c  f1 46 2a 54 6e 54 bf 90  |*...."...F*TnT..|
-00000160  89 01 5e e4 e2 aa 7b d7  bc e9 37 d4 ee 75 18 57  |..^...{...7..u.W|
-00000170  0c f7 8b fb 70 b2 cc 1c  e2 ed 64 20 22 56 7a d3  |....p.....d "Vz.|
-00000180  24 eb 25 0d 29 6f 8b be  5a 99 89 eb aa 04 18 8c  |$.%.)o..Z.......|
-00000190  bd c8 b3 95 57 5d 5b 00  55 d8 ef a0 22 f8 cb 26  |....W][.U..."..&|
-000001a0  8d e0 9a 25 a7 77 6d 25  27 c3 aa 75 f7 51 15 c5  |...%.wm%'..u.Q..|
-000001b0  30 72 57 ef d4 41 3e cf  dd fc 77 d9 d8 08 41 87  |0rW..A>...w...A.|
-000001c0  b6 9a 06 c6 f2 00 c5 a2  14 e9 f3 52 91 65 db 69  |...........R.e.i|
-000001d0  a7 2e fb 32 5c 3f 13 c8  ea 65 3a 3a 4d 65 a9 69  |...2\?...e::Me.i|
-000001e0  3f 7b f8 7c ee 1e a2 87  81 10 5c 7f 8d 37 1a 75  |?{.|......\..7.u|
-000001f0  29 8a 78 58 8a d7 f7 af  75 ee 3d f2 58 c2 de a5  |).xX....u.=.X...|
-00000200  60 e7 f9 a3 a1 66 cf df  76 2f 2a cf 5e 6e 80 a3  |`....f..v/*.^n..|
-00000210  47 16 c9 c9 d1 b5 02 38  63 0a 86 fc f2 e8 0b 16  |G......8c.......|
-00000220  d6 43 8e d1 68 b8 01 a0  63 69 01 c8 d3 1e eb 48  |.C..h...ci.....H|
-00000230  28 5e 82 24 3a 19 62 f2  48 65 13 82 77 8c 9a ca  |(^.$:.b.He..w...|
-00000240  69 84 27 4d fd 88 81 79  74 8a a7 ef 2e be 6c c7  |i.'M...yt.....l.|
-00000250  89 9d 19 ab 44 fa 35 99  cc 8e af c3 c0 98 85 85  |....D.5.........|
-00000260  e7 92 45 84 39 c3 2d 27  a1 55 98 81 3a 09 1f f3  |..E.9.-'.U..:...|
-00000270  9a 86 e5 53 f4 7d 35 8d  1f 2e 06 ef ed bf eb cb  |...S.}5.........|
-00000280  54 41 b7 9c d9 df 1b 75  00 f3 81 29 27 e4 ed 90  |TA.....u...)'...|
-00000290  bd 16 39 96 15 22 c3 19  35 5c 88 db 00 05 38 77  |..9.."..5\....8w|
-000002a0  8e ef 42 f5 b2 8c 0a 6c  7f 38 7a f7 c1 13 a6 3d  |..B....l.8z....=|
-000002b0  80 3c 62 aa 26 d0 80 08  31 b0 f4 84 36 c1 8d 51  |.<b.&...1...6..Q|
-000002c0  6b 8c cd d7 e8 fa 95 8e  33 1d 33 16 a4 3f a9 85  |k.......3.3..?..|
-000002d0  cc 37 5e b9 29 4d ba 06  55 31 c5 4f c3 bd 91 f2  |.7^.)M..U1.O....|
-000002e0  8e c6 b7 a5 2d 58 09 fc  49 a5 74 1f 29 3d 4c 01  |....-X..I.t.)=L.|
-000002f0  73 6f a8 ae 1e af d8 91  2a 5b a0 69 59 91 03 92  |so......*[.iY...|
-00000300  bc d3 a0 f5 dd 1d 33 f2  a1 89 14 be 4a 17 03 03  |......3.....J...|
-00000310  00 99 d1 cc 25 8c e1 97  49 3f bf 3a cc b7 f1 84  |....%...I?.:....|
-00000320  16 7e 07 3c 18 f1 40 99  8f f4 ad 33 75 9d b5 c9  |.~.<..@....3u...|
-00000330  5b fe 17 e6 b1 4c 34 2d  02 67 16 1d 54 7a 0b 2e  |[....L4-.g..Tz..|
-00000340  ae 28 fd a0 a6 15 a0 ed  b1 12 19 6e 42 87 f9 96  |.(.........nB...|
-00000350  0e 7d 5e 4e 03 5b a0 c8  36 8f ed 4a 9b 87 3f 09  |.}^N.[..6..J..?.|
-00000360  c3 d0 4a e0 56 b7 fa fd  2b 3d 09 b9 d8 27 39 d9  |..J.V...+=...'9.|
-00000370  ff ab 4a 37 e6 5a 0f 74  3b c7 b2 56 5b c3 b6 34  |..J7.Z.t;..V[..4|
-00000380  0c 94 d2 0f 81 21 41 62  63 8c c4 19 38 3a 98 a6  |.....!Abc...8:..|
-00000390  4f 60 7e 38 bb 05 f9 06  17 31 cb b7 a5 ed 96 7c  |O`~8.....1.....||
-000003a0  9f 8f 87 f2 6d 53 84 e1  9c bd 9c 17 03 03 00 45  |....mS.........E|
-000003b0  8f 46 b9 62 e1 e3 a4 80  ac d7 63 17 6d 5c 9e 40  |.F.b......c.m\.@|
-000003c0  ef 8d 18 98 39 6c 3f 75  5a dc e5 d5 c5 55 d3 b5  |....9l?uZ....U..|
-000003d0  53 2d 4b 1e 04 50 30 a6  f2 a2 e4 db 15 40 25 fb  |S-K..P0......@%.|
-000003e0  b7 51 9c 24 cd 01 33 13  87 c4 35 04 db 28 67 a6  |.Q.$..3...5..(g.|
-000003f0  0f 6f 62 13 1f                                    |.ob..|
+00000070  ff f6 84 af c4 cf c2 ed  90 99 5f 58 cb 3b 74 14  |.........._X.;t.|
+00000080  03 03 00 01 01 17 03 03  00 17 24 64 74 26 90 fe  |..........$dt&..|
+00000090  68 e7 db 87 79 32 3b 7c  2c e8 2e 2d d0 d1 d2 97  |h...y2;|,..-....|
+000000a0  62 17 03 03 02 6d 41 22  d8 7d 6c 44 d0 6e 2b 79  |b....mA".}lD.n+y|
+000000b0  bd d5 56 10 2a a6 41 c4  7f 2c 1f 01 b5 3a b2 e7  |..V.*.A..,...:..|
+000000c0  44 6f c2 d2 2b 83 74 80  46 8e 7e 24 81 b0 8e c4  |Do..+.t.F.~$....|
+000000d0  f0 90 03 89 03 b1 89 c5  28 b4 cc bc 3d df a9 25  |........(...=..%|
+000000e0  db f5 f1 1c f2 f3 04 15  d6 f7 f7 c3 03 24 dd e0  |.............$..|
+000000f0  19 22 62 67 3a 80 f8 f7  83 ca 5c 3f eb 9b 6e 98  |."bg:.....\?..n.|
+00000100  8a 2f ba c2 ed bc dd 28  75 1f a2 27 42 89 39 3e  |./.....(u..'B.9>|
+00000110  01 e0 88 73 0f bb f4 cc  7c 75 3a 3f b4 68 04 be  |...s....|u:?.h..|
+00000120  4e d7 c2 2c 8d 41 df 6c  44 b3 1b 35 dc 46 36 3f  |N..,.A.lD..5.F6?|
+00000130  f0 dc e4 cc c3 ca 3b bf  3f fa bf 87 7c 2e 65 e1  |......;.?...|.e.|
+00000140  d3 4b 2c 2a 6b 1a 57 8c  76 06 53 02 ef 79 d4 6f  |.K,*k.W.v.S..y.o|
+00000150  93 f0 36 f9 cb 13 05 b3  8c 22 16 fd 0a c2 e8 45  |..6......".....E|
+00000160  fa 46 e7 ce f2 35 9f 32  88 97 67 46 e9 0c 13 77  |.F...5.2..gF...w|
+00000170  30 b8 f3 59 71 e6 65 4f  f5 5b 06 6e 9a 7f 7a 24  |0..Yq.eO.[.n..z$|
+00000180  c5 e6 05 eb 8a ec 4d 0f  73 2c 6d aa 54 3d 5c 40  |......M.s,m.T=\@|
+00000190  44 68 7f e6 52 b1 02 37  8c a0 be c8 3a f0 74 85  |Dh..R..7....:.t.|
+000001a0  4e 0a 20 46 6c 3c 42 e7  94 18 02 30 a7 43 e7 c9  |N. Fl<B....0.C..|
+000001b0  11 c0 19 45 39 04 64 66  3e 9c 2a e4 bb 86 b8 92  |...E9.df>.*.....|
+000001c0  3d 77 1e 4e 13 51 7e 38  ba 06 b1 62 99 6c 98 8d  |=w.N.Q~8...b.l..|
+000001d0  87 b4 59 01 93 d3 84 80  6f e6 07 18 e0 a3 07 5d  |..Y.....o......]|
+000001e0  b7 97 1a 8b ed 78 20 d1  28 0e 60 dc 51 37 b1 07  |.....x .(.`.Q7..|
+000001f0  81 b1 0b d8 81 f4 79 bf  3d ae 60 32 22 2b c5 9c  |......y.=.`2"+..|
+00000200  d1 37 3a f8 71 22 49 c2  a7 1e 5a 56 c1 c4 b4 5d  |.7:.q"I...ZV...]|
+00000210  2a 08 60 c6 75 2a 10 3e  c0 84 77 dd 1d a6 be 8c  |*.`.u*.>..w.....|
+00000220  a7 2a 20 6b e1 20 bb bd  03 fb c1 2c 33 fb 97 64  |.* k. .....,3..d|
+00000230  88 31 75 df 6e b3 49 dd  e8 f2 b8 13 ca d5 24 40  |.1u.n.I.......$@|
+00000240  e6 0b e5 7e 12 cb 20 60  b0 0a 72 b6 a5 93 2d ea  |...~.. `..r...-.|
+00000250  74 22 48 b7 7e 10 bf 81  55 eb 3d 0c 33 f6 37 66  |t"H.~...U.=.3.7f|
+00000260  04 2a 1b 9c 3e 0a 06 0d  53 88 f0 cf 4f 52 c4 a1  |.*..>...S...OR..|
+00000270  31 ff b0 8e 5c 8e c3 cc  0d a1 68 cb f6 2e 0f 57  |1...\.....h....W|
+00000280  06 f9 d6 80 e5 ac b8 24  1f ef 6e b9 5c 32 a4 e1  |.......$..n.\2..|
+00000290  44 14 99 75 6e 57 d6 6b  51 5f 16 ee 65 c6 fc 96  |D..unW.kQ_..e...|
+000002a0  4e ea 83 85 3f c9 f6 5b  b8 14 5e 6a 41 2b 0f 91  |N...?..[..^jA+..|
+000002b0  ab 79 f4 3d 0e 63 2a 99  eb 4a e9 07 b8 cd fb d2  |.y.=.c*..J......|
+000002c0  ad 33 e6 48 25 b2 b3 29  a6 fc 14 84 a5 ee 53 44  |.3.H%..)......SD|
+000002d0  d4 b2 93 db 86 a6 b2 b3  ea 22 3d a7 52 db 53 56  |........."=.R.SV|
+000002e0  96 20 24 59 6c b6 10 c2  f4 88 9a ff 69 d3 92 0c  |. $Yl.......i...|
+000002f0  da e7 67 63 af 3f 94 c2  06 9f da 8a 78 f5 6d 4d  |..gc.?......x.mM|
+00000300  3d 7b fe 43 6c 71 82 ce  34 07 4b e2 57 05 f8 5c  |={.Clq..4.K.W..\|
+00000310  dc 17 03 17 03 03 00 99  97 2b be f7 da 39 40 7e  |.........+...9@~|
+00000320  9f bd 0a 93 db c8 0d 89  e9 b8 52 5c f6 83 6d 6c  |..........R\..ml|
+00000330  d9 44 1a 3a fe 39 05 f5  c3 25 5e 5e 92 4d 84 d9  |.D.:.9...%^^.M..|
+00000340  0e bc f2 27 09 e0 ba 70  f1 0a 9d 6a af b5 e7 90  |...'...p...j....|
+00000350  8c 91 c7 82 9b d4 8b 88  dc 16 ec 33 2c 81 e7 4f  |...........3,..O|
+00000360  ad dd c1 c5 c6 59 36 d4  aa 39 f1 6f de 93 a7 0e  |.....Y6..9.o....|
+00000370  39 e4 f3 cf 01 b3 ed ad  10 01 70 20 60 ac 6a c5  |9.........p `.j.|
+00000380  ec ec f9 fb 7c 40 72 10  c4 99 8f 10 eb b0 08 4e  |....|@r........N|
+00000390  dd 3f 65 a4 34 c0 69 94  2a 7c 2d cb 33 3b d5 b9  |.?e.4.i.*|-.3;..|
+000003a0  03 e0 e9 63 37 54 73 6a  34 ad c9 65 d1 d4 d7 6b  |...c7Tsj4..e...k|
+000003b0  38 17 03 03 00 45 1c f4  15 86 6e b6 2d cd 84 30  |8....E....n.-..0|
+000003c0  55 82 13 52 d9 c9 3f 01  27 ee 01 9c d4 da be ab  |U..R..?.'.......|
+000003d0  be 10 4d 82 55 32 86 a0  7b 74 bc 15 aa 68 3a e4  |..M.U2..{t...h:.|
+000003e0  a1 3a d9 0e b6 c3 60 48  b4 7d e1 77 9d ce f9 41  |.:....`H.}.w...A|
+000003f0  5f f7 d5 db ea 1f 6e b1  11 cd ca                 |_.....n....|
 >>> Flow 3 (client to server)
-00000000  14 03 03 00 01 01 17 03  03 00 45 93 78 a6 3d 50  |..........E.x.=P|
-00000010  bd bf cb d5 f5 2d af d7  1a 04 5a 7c 18 57 5f ce  |.....-....Z|.W_.|
-00000020  bf aa f3 25 1d 19 29 3a  90 06 9b 9a ad bb 03 92  |...%..):........|
-00000030  58 62 1f db 30 3b db 83  bf 21 dc 32 50 7a cc c1  |Xb..0;...!.2Pz..|
-00000040  51 2d 46 a4 41 eb 07 b3  91 54 55 23 bd 1b c9 82  |Q-F.A....TU#....|
+00000000  14 03 03 00 01 01 17 03  03 00 45 e9 b8 73 86 f8  |..........E..s..|
+00000010  0c ba 6d ee 91 c4 70 d6  06 df 59 f8 28 21 92 3d  |..m...p...Y.(!.=|
+00000020  a5 ad 7c d3 08 ad ea f6  9f c8 d6 8a b1 f0 fc d2  |..|.............|
+00000030  52 91 e8 1b b4 0b b9 a0  6e 48 18 d8 fb fe 3e d1  |R.......nH....>.|
+00000040  d9 81 d5 9f 6a bd 83 74  c5 2d fb 42 95 57 5b 23  |....j..t.-.B.W[#|
 >>> Flow 4 (server to client)
-00000000  17 03 03 00 1e 94 17 fa  b4 46 cf 05 18 36 1e 2c  |.........F...6.,|
-00000010  fa b8 76 fd 66 4f d0 6c  df 7d 35 ea cc 5f 8c fb  |..v.fO.l.}5.._..|
-00000020  6f 31 cc 17 03 03 00 13  7e 91 d1 39 ce 2c 4d e4  |o1......~..9.,M.|
-00000030  49 90 a1 a6 c1 12 bf 0b  12 80 40                 |I.........@|
+00000000  17 03 03 00 1e 64 cd 12  df 96 8c 5d a7 8f 92 98  |.....d.....]....|
+00000010  c9 f7 16 11 4e 37 48 dd  55 b2 c6 4c 91 82 8d a8  |....N7H.U..L....|
+00000020  01 8b a3 17 03 03 00 13  68 92 77 f7 88 86 d9 3c  |........h.w....<|
+00000030  4a 52 35 b2 2c b7 24 03  3c db 6c                 |JR5.,.$.<.l|